commit 804285f589ded484b530750dd1ec03b9052bcdac · pyrox.dev/nixpkgs

+40 -1

doc/cross-compilation.xml

···

       187
       187
        
             How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from <varname>buildPackages</varname>, whereas run-time dependencies are taken from the top level attribute set.

     

       188
       188
        
             For example, <varname>buildPackages.gcc</varname> should be used at build time, while <varname>gcc</varname> should be used at run time.

     

       189
       189
        
             Now, for most of Nixpkgs's history, there was no <varname>buildPackages</varname>, and most packages have not been refactored to use it explicitly.

     

       190
       190
       -
             Instead, one can use the four attributes used for specifying dependencies as documented in <xref linkend="ssec-stdenv-attributes"/>.

     

       190
       190
       +
             Instead, one can use the six (<emphasis>gasp</emphasis>) attributes used for specifying dependencies as documented in <xref linkend="ssec-stdenv-dependencies"/>.

     

       191
       191
        
             We "splice" together the run-time and build-time package sets with <varname>callPackage</varname>, and then <varname>mkDerivation</varname> for each of four attributes pulls the right derivation out.

     

       192
       192
        
             This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling.

     

       193
       193
        
             Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of <varname>buildPackages</varname> needed.

     
···

       200
       200
        
           </para></note>

     

       201
       201
        
         </section>

     

       202
       202
        
       

     

       203
       203
       +
         <section>

     

       204
       204
       +
           <title>Cross packagaing cookbook</title>

     

       205
       205
       +
           <para>

     

       206
       206
       +
             Some frequently problems when packaging for cross compilation are good to just spell and answer.

     

       207
       207
       +
             Ideally the information above is exhaustive, so this section cannot provide any new information,

     

       208
       208
       +
             but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem.

     

       209
       209
       +
             Feel free to add to this list!

     

       210
       210
       +
           </para>

     

       211
       211
       +
           <qandaset>

     

       212
       212
       +
             <qandaentry>

     

       213
       213
       +
               <question><para>

     

       214
       214
       +
                 What if my package's build system needs to build a C program to be run under the build environment?

     

       215
       215
       +
               </para></question>

     

       216
       216
       +
               <answer><para>

     

       217
       217
       +
                 <programlisting>depsBuildBuild = [ buildPackages.stdenv.cc ];</programlisting>

     

       218
       218
       +
                 Add it to your <function>mkDerivation</function> invocation.

     

       219
       219
       +
               </para></answer>

     

       220
       220
       +
             </qandaentry>

     

       221
       221
       +
             <qandaentry>

     

       222
       222
       +
               <question><para>

     

       223
       223
       +
                 My package fails to find <command>ar</command>.

     

       224
       224
       +
               </para></question>

     

       225
       225
       +
               <answer><para>

     

       226
       226
       +
                 Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one.

     

       227
       227
       +
                 It only provides a prefixed one, just as it only does for all the other binutils programs.

     

       228
       228
       +
                 It may be necessary to patch the package to fix the build system to use a prefixed `ar`.

     

       229
       229
       +
               </para></answer>

     

       230
       230
       +
             </qandaentry>

     

       231
       231
       +
             <qandaentry>

     

       232
       232
       +
               <question><para>

     

       233
       233
       +
                 My package's testsuite needs to run host platform code.

     

       234
       234
       +
               </para></question>

     

       235
       235
       +
               <answer><para>

     

       236
       236
       +
                 <programlisting>doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;</programlisting>

     

       237
       237
       +
                 Add it to your <function>mkDerivation</function> invocation.

     

       238
       238
       +
               </para></answer>

     

       239
       239
       +
             </qandaentry>

     

       240
       240
       +
           </qandaset>

     

       241
       241
       +
         </section>

     

       203
       242
        
       </section>

     

       204
       243
        
       

     

       205
       244
        
       <!--============================================================-->

+318 -39

doc/stdenv.xml

···

       179
       179
        
       </section>

     

       180
       180
        
       

     

       181
       181
        
       

     

       182
       182
       -
       <section xml:id="ssec-stdenv-attributes"><title>Attributes</title>

     

       182
       182
       +
       <section xml:id="ssec-stdenv-dependencies"><title>Specifying dependencies</title>

     

       183
       183
       +
       

     

       184
       184
       +
       <para>

     

       185
       185
       +
         As described in the Nix manual, almost any <filename>*.drv</filename> store path in a derivation's attribute set will induce a dependency on that derivation.

     

       186
       186
       +
         <varname>mkDerivation</varname>, however, takes a few attributes intended to, between them, include all the dependencies of a package.

     

       187
       187
       +
         This is done both for structure and consistency, but also so that certain other setup can take place.

     

       188
       188
       +
         For example, certain dependencies need their bin directories added to the <envar>PATH</envar>.

     

       189
       189
       +
         That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes.

     

       190
       190
       +
         See <xref linkend="ssec-setup-hooks"/> for details.

     

       191
       191
       +
       </para>

     

       192
       192
       +
       <para>

     

       193
       193
       +
         Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated.

     

       194
       194
       +
         The platform distinctions are motivated by cross compilation; see <xref linkend="chap-cross"/> for exactly what each platform means.

     

       195
       195
       +
         <footnote><para>

     

       196
       196
       +
           The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency:

     

       197
       197
       +
           As a general programming principle, dependencies are always <emphasis>specified</emphasis> as interfaces, not concrete implementation.

     

       198
       198
       +
         </para></footnote>

     

       199
       199
       +
         But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation.

     

       200
       200
       +
         For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced.

     

       201
       201
       +
       </para>

     

       202
       202
       +
       <para>

     

       203
       203
       +
         The extension of <envar>PATH</envar> with dependencies, alluded to above, proceeds according to the relative platforms alone.

     

       204
       204
       +
         The process is carried out only for dependencies whose host platform matches the new derivation's build platform–i.e. which run on the platform where the new derivation will be built.

     

       205
       205
       +
         <footnote><para>

     

       206
       206
       +
           Currently, that means for native builds all dependencies are put on the <envar>PATH</envar>.

     

       207
       207
       +
           But in the future that may not be the case for sake of matching cross:

     

       208
       208
       +
           the platforms would be assumed to be unique for native and cross builds alike, so only the <varname>depsBuild*</varname> and <varname>nativeBuildDependencies</varname> dependencies would affect the <envar>PATH</envar>.

     

       209
       209
       +
         </para></footnote>

     

       210
       210
       +
         For each dependency <replaceable>dep</replaceable> of those dependencies, <filename><replaceable>dep</replaceable>/bin</filename>, if present, is added to the <envar>PATH</envar> environment variable.

     

       211
       211
       +
       </para>

     

       212
       212
       +
       <para>

     

       213
       213
       +
         The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency.

     

       214
       214
       +
         Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.

     

       215
       215
       +
       </para>

     

       216
       216
       +
       <para>

     

       217
       217
       +
         It is important to note dependencies are not necessary propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up.

     

       218
       218
       +
         The exact rules for dependency propagation can be given by assigning each sort of dependency two integers based one how it's host and target platforms are offset from the depending derivation's platforms.

     

       219
       219
       +
         Those offsets are given are given below in the descriptions of each dependency list attribute.

     

       220
       220
       +
         Algorithmically, we traverse propagated inputs, accumulating every propagated dep's propagated deps and adjusting them to account for the "shift in perspective" described by the current dep's platform offsets.

     

       221
       221
       +
         This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined.

     

       222
       222
       +
         We also prune transitive deps whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.

     

       223
       223
       +
       </para>

     

       224
       224
       +
       <para>

     

       225
       225
       +
         We can define the process precisely with <link xlink:href="https://en.wikipedia.org/wiki/Natural_deduction">Natural Deduction</link> using the inference rules.

     

       226
       226
       +
         This probably seems a bit obtuse, but so is the bash code that actually implements it!

     

       227
       227
       +
         <footnote><para>

     

       228
       228
       +
           The <function>findInputs</function> function, currently residing in <filename>pkgs/stdenv/generic/setup.sh</filename>, implements the propagation logic.

     

       229
       229
       +
         </para></footnote>

     

       230
       230
       +
         They're confusing in very different ways so...hopefully if something doesn't make sense in one presentation, it does in the other!

     

       231
       231
       +
         <programlisting>

     

       232
       232
       +
       let mapOffset(h, t, i) = i + (if i &lt;= 0 then h else t - 1)

     

       233
       233
       +
       

     

       234
       234
       +
       propagated-dep(h0, t0, A, B)

     

       235
       235
       +
       propagated-dep(h1, t1, B, C)

     

       236
       236
       +
       h0 + h1 in {-1, 0, 1}

     

       237
       237
       +
       h0 + t1 in {-1, 0, 1}

     

       238
       238
       +
       -------------------------------------- Transitive property

     

       239
       239
       +
       propagated-dep(mapOffset(h0, t0, h1),

     

       240
       240
       +
                      mapOffset(h0, t0, t1),

     

       241
       241
       +
                      A, C)</programlisting>

     

       242
       242
       +
         <programlisting>

     

       243
       243
       +
       let mapOffset(h, t, i) = i + (if i &lt;= 0 then h else t - 1)

     

       244
       244
       +
       

     

       245
       245
       +
       dep(h0, _, A, B)

     

       246
       246
       +
       propagated-dep(h1, t1, B, C)

     

       247
       247
       +
       h0 + h1 in {-1, 0, 1}

     

       248
       248
       +
       h0 + t1 in {-1, 0, -1}

     

       249
       249
       +
       -------------------------------------- Take immediate deps' propagated deps

     

       250
       250
       +
       propagated-dep(mapOffset(h0, t0, h1),

     

       251
       251
       +
                      mapOffset(h0, t0, t1),

     

       252
       252
       +
                      A, C)</programlisting>

     

       253
       253
       +
         <programlisting>

     

       254
       254
       +
       propagated-dep(h, t, A, B)

     

       255
       255
       +
       -------------------------------------- Propagated deps count as deps

     

       256
       256
       +
       dep(h, t, A, B)</programlisting>

     

       257
       257
       +
         Some explanation of this monstrosity is in order.

     

       258
       258
       +
         In the common case, the target offset of a dependency is the successor to the target offset: <literal>t = h + 1</literal>.

     

       259
       259
       +
         That means that:

     

       260
       260
       +
         <programlisting>

     

       261
       261
       +
       let f(h, t, i) = i + (if i &lt;= 0 then h else t - 1)

     

       262
       262
       +
       let f(h, h + 1, i) = i + (if i &lt;= 0 then h else (h + 1) - 1)

     

       263
       263
       +
       let f(h, h + 1, i) = i + (if i &lt;= 0 then h else h)

     

       264
       264
       +
       let f(h, h + 1, i) = i + h

     

       265
       265
       +
         </programlisting>

     

       266
       266
       +
         This is where the "sum-like" comes from above:

     

       267
       267
       +
         We can just sum all the host offset to get the host offset of the transitive dependency.

     

       268
       268
       +
         The target offset is the transitive dep is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one;

     

       269
       269
       +
         it can be ignored as it doesn't add any new information.

     

       270
       270
       +
       </para>

     

       271
       271
       +
       <para>

     

       272
       272
       +
         Because of the bounds checks, the uncommon cases are <literal>h = t</literal> and <literal>h + 2 = t</literal>.

     

       273
       273
       +
         In the former case, the motivation for <function>mapOffset</function> is that since its host and target platforms are the same, no transitive dep of it should be able to "discover" an offset greater than its reduced target offsets.

     

       274
       274
       +
         <function>mapOffset</function> effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original <literal>h = t</literal> package.

     

       275
       275
       +
         In the other case, <literal>h + 1</literal> is skipped over between the host and target offsets.

     

       276
       276
       +
         Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one.

     

       277
       277
       +
       </para>

     

       278
       278
       +
       <para>

     

       279
       279
       +
       Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the needing package is unaware of.

     

       280
       280
       +
       The offset bounds checking and definition of <function>mapOffset</function> together ensure that this is the case.

     

       281
       281
       +
       Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant.

     

       282
       282
       +
       From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.

     

       283
       283
       +
       </para>

     

       183
       284
        
       

     

       184
       285
        
       <variablelist>

     

       185
       185
       -
         <title>Variables affecting <literal>stdenv</literal>

     

       186
       186
       -
         initialisation</title>

     

       286
       286
       +
         <title>Variables specifying dependencies</title>

     

       287
       287
       +
       

     

       288
       288
       +
          <varlistentry>

     

       289
       289
       +
            <term><varname>depsBuildBuild</varname></term>

     

       290
       290
       +
            <listitem>

     

       291
       291
       +
              <para>

     

       292
       292
       +
                A list of dependencies whose host and target platforms are the new derivation's build platform.

     

       293
       293
       +
                This means a <literal>-1</literal> host and <literal>-1</literal> target offset from the new derivation's platforms.

     

       294
       294
       +
                They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time.

     

       295
       295
       +
                If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in <varname>nativeBuildInputs</varname>instead.

     

       296
       296
       +
                The most common use for this <literal>buildPackages.stdenv.cc</literal>, the default C compiler for this role.

     

       297
       297
       +
                That example crops up more than one might think in old commonly used C libraries.

     

       298
       298
       +
              </para>

     

       299
       299
       +
              <para>

     

       300
       300
       +
                Since these packages are able to be run at build time, that are always added to the <envar>PATH</envar>, as described above.

     

       301
       301
       +
                But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies.

     

       302
       302
       +
                This isn't currently enforced, but could be in the future.

     

       303
       303
       +
              </para>

     

       304
       304
       +
            </listitem>

     

       305
       305
       +
         </varlistentry>

     

       306
       306
       +
       

     

       307
       307
       +
         <varlistentry>

     

       308
       308
       +
           <term><varname>nativeBuildInputs</varname></term>

     

       309
       309
       +
           <listitem>

     

       310
       310
       +
             <para>

     

       311
       311
       +
               A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform.

     

       312
       312
       +
               This means a <literal>-1</literal> host offset and <literal>0</literal> target offset from the new derivation's platforms.

     

       313
       313
       +
               They are programs/libraries used at build time that, if they are a compiler or similar tool, produce code to run at run time—i.e. tools used to build the new derivation.

     

       314
       314
       +
               If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>.

     

       315
       315
       +
               This would be called <varname>depsBuildHost</varname> but for historical continuity.

     

       316
       316
       +
             </para>

     

       317
       317
       +
             <para>

     

       318
       318
       +
                Since these packages are able to be run at build time, that are added to the <envar>PATH</envar>, as described above.

     

       319
       319
       +
                But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies.

     

       320
       320
       +
                This isn't currently enforced, but could be in the future.

     

       321
       321
       +
              </para>

     

       322
       322
       +
           </listitem>

     

       323
       323
       +
         </varlistentry>

     

       187
       324
        
       

     

       188
       325
        
         <varlistentry>

     

       189
       189
       -
           <term><varname>NIX_DEBUG</varname></term>

     

       326
       326
       +
           <term><varname>depsBuildTarget</varname></term>

     

       327
       327
       +
           <listitem>

     

       328
       328
       +
             <para>

     

       329
       329
       +
               A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform.

     

       330
       330
       +
               This means a <literal>-1</literal> host offset and <literal>1</literal> target offset from the new derivation's platforms.

     

       331
       331
       +
               They are programs used at build time that produce code to run at run with code produced by the depending package.

     

       332
       332
       +
               Most commonly, these would tools used to build the runtime or standard library the currently-being-built compiler will inject into any code it compiles.

     

       333
       333
       +
               In many cases, the currently-being built compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible.

     

       334
       334
       +
               Other times, the compiler relies on some other tool, like binutils, that is always built separately so the dependency is unconditional.

     

       335
       335
       +
             </para>

     

       336
       336
       +
             <para>

     

       337
       337
       +
               This is a somewhat confusing dependency to wrap ones head around, and for good reason.

     

       338
       338
       +
               As the only one where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage <emphasis>two</emphasis> away from the current one.

     

       339
       339
       +
               It and it's use-case go hand in hand and are both considered poor form:

     

       340
       340
       +
               try not to need this sort dependency, and try not avoid building standard libraries / runtimes in the same derivation as the compiler produces code using them.

     

       341
       341
       +
               Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would.

     

       342
       342
       +
               In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.

     

       343
       343
       +
            </para>

     

       344
       344
       +
            <para>

     

       345
       345
       +
              Since these packages are able to be run at build time, that are added to the <envar>PATH</envar>, as described above.

     

       346
       346
       +
              But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies.

     

       347
       347
       +
              This isn't currently enforced, but could be in the future.

     

       348
       348
       +
            </para>

     

       349
       349
       +
           </listitem>

     

       350
       350
       +
         </varlistentry>

     

       351
       351
       +
       

     

       352
       352
       +
         <varlistentry>

     

       353
       353
       +
           <term><varname>depsHostHost</varname></term>

     

       190
       354
        
           <listitem><para>

     

       191
       191
       -
             A natural number indicating how much information to log.

     

       192
       192
       -
             If set to 1 or higher, <literal>stdenv</literal> will print moderate debug information during the build.

     

       193
       193
       -
             In particular, the <command>gcc</command> and <command>ld</command> wrapper scripts will print out the complete command line passed to the wrapped tools.

     

       194
       194
       -
             If set to 6 or higher, the <literal>stdenv</literal> setup script will be run with <literal>set -x</literal> tracing.

     

       195
       195
       -
             If set to 7 or higher, the <command>gcc</command> and <command>ld</command> wrapper scripts will also be run with <literal>set -x</literal> tracing.

     

       355
       355
       +
             A list of dependencies whose host and target platforms match the new derivation's host platform.

     

       356
       356
       +
             This means a both <literal>0</literal> host offset and <literal>0</literal> target offset from the new derivation's host platform.

     

       357
       357
       +
             These are packages used at run-time to generate code also used at run-time.

     

       358
       358
       +
             In practice, that would usually be tools used by compilers for metaprogramming/macro systems, or libraries used by the macros/metaprogramming code itself.

     

       359
       359
       +
             It's always preferable to use a <varname>depsBuildBuild</varname> dependency in the derivation being built than a <varname>depsHostHost</varname> on the tool doing the building for this purpose.

     

       196
       360
        
           </para></listitem>

     

       197
       361
        
         </varlistentry>

     

       198
       362
        
       

     

       199
       199
       -
       </variablelist>

     

       363
       363
       +
         <varlistentry>

     

       364
       364
       +
           <term><varname>buildInputs</varname></term>

     

       365
       365
       +
           <listitem>

     

       366
       366
       +
             <para>

     

       367
       367
       +
               A list of dependencies whose host platform and target platform match the new derivation's.

     

       368
       368
       +
               This means a <literal>0</literal> host offset and <literal>1</literal> target offset from the new derivation's host platform.

     

       369
       369
       +
               This would be called <varname>depsHostTarget</varname> but for historical continuity.

     

       370
       370
       +
               If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in <varname>depsBuildBuild</varname>.

     

       371
       371
       +
             </para>

     

       372
       372
       +
             <para>

     

       373
       373
       +
               These often are programs/libraries used by the new derivation at <emphasis>run</emphasis>-time, but that isn't always the case.

     

       374
       374
       +
               For example, the machine code in a statically linked library is only used at run time, but the derivation containing the library is only needed at build time.

     

       375
       375
       +
               Even in the dynamic case, the library may also be needed at build time to appease the linker.

     

       376
       376
       +
             </para>

     

       377
       377
       +
           </listitem>

     

       378
       378
       +
         </varlistentry>

     

       200
       379
        
       

     

       201
       201
       -
       <variablelist>

     

       202
       202
       -
         <title>Variables specifying dependencies</title>

     

       380
       380
       +
         <varlistentry>

     

       381
       381
       +
           <term><varname>depsTargetTarget</varname></term>

     

       382
       382
       +
           <listitem><para>

     

       383
       383
       +
             A list of dependencies whose host platform matches the new derivation's target platform.

     

       384
       384
       +
             This means a <literal>1</literal> offset from the new derivation's platforms.

     

       385
       385
       +
             These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about.

     

       386
       386
       +
             It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset].

     

       387
       387
       +
             Do not use this attribute unless you are packaging a compiler and are sure it is needed.

     

       388
       388
       +
           </para></listitem>

     

       389
       389
       +
         </varlistentry>

     

       203
       390
        
       

     

       204
       391
        
         <varlistentry>

     

       205
       205
       -
           <term><varname>nativeBuildInputs</varname></term>

     

       392
       392
       +
           <term><varname>depsBuildBuildPropagated</varname></term>

     

       206
       393
        
           <listitem><para>

     

       207
       207
       -
             A list of dependencies used by the new derivation at <emphasis>build</emphasis>-time.

     

       208
       208
       -
             I.e. these dependencies should not make it into the package's runtime-closure, though this is currently not checked.

     

       209
       209
       -
             For each dependency <replaceable>dir</replaceable>, the directory <filename><replaceable>dir</replaceable>/bin</filename>, if it exists, is added to the <envar>PATH</envar> environment variable.

     

       210
       210
       -
             Other environment variables are also set up via a pluggable mechanism.

     

       211
       211
       -
             For instance, if <varname>buildInputs</varname> contains Perl, then the <filename>lib/site_perl</filename> subdirectory of each input is added to the <envar>PERL5LIB</envar> environment variable.

     

       212
       212
       -
             See <xref linkend="ssec-setup-hooks"/> for details.

     

       394
       394
       +
             The propagated equivalent of <varname>depsBuildBuild</varname>.

     

       395
       395
       +
             This perhaps never ought to be used, but it is included for consistency [see below for the others].

     

       213
       396
        
           </para></listitem>

     

       214
       397
        
         </varlistentry>

     

       215
       398
        
       

     

       216
       399
        
         <varlistentry>

     

       217
       217
       -
           <term><varname>buildInputs</varname></term>

     

       400
       400
       +
           <term><varname>propagatedNativeBuildInputs</varname></term>

     

       218
       401
        
           <listitem><para>

     

       219
       219
       -
             A list of dependencies used by the new derivation at <emphasis>run</emphasis>-time.

     

       220
       220
       -
             Currently, the build-time environment is modified in the exact same way as with <varname>nativeBuildInputs</varname>.

     

       221
       221
       -
             This is problematic in that when cross-compiling, foreign executables can clobber native ones on the <envar>PATH</envar>.

     

       222
       222
       -
             Even more confusing is static-linking.

     

       223
       223
       -
             A statically-linked library should be listed here because ultimately that generated machine code will be used at run-time, even though a derivation containing the object files or static archives will only be used at build-time.

     

       224
       224
       -
             A less confusing solution to this would be nice.

     

       402
       402
       +
             The propagated equivalent of <varname>nativeBuildInputs</varname>.

     

       403
       403
       +
             This would be called <varname>depsBuildHostPropagated</varname> but for historical continuity.

     

       404
       404
       +
             For example, if package <varname>Y</varname> has <literal>propagatedNativeBuildInputs = [X]</literal>, and package <varname>Z</varname> has <literal>buildInputs = [Y]</literal>, then package <varname>Z</varname> will be built as if it included package <varname>X</varname> in its <varname>nativeBuildInputs</varname>.

     

       405
       405
       +
             If instead, package <varname>Z</varname> has <literal>nativeBuildInputs = [Y]</literal>, then <varname>Z</varname> will be built as if it included <varname>X</varname> in the <varname>depsBuildBuild</varname> of package <varname>Z</varname>, because of the sum of the two <literal>-1</literal> host offsets.

     

       225
       406
        
           </para></listitem>

     

       226
       407
        
         </varlistentry>

     

       227
       408
        
       

     

       409
       409
       +
         <varlistentry>

     

       410
       410
       +
           <term><varname>depsBuildTargetPropagated</varname></term>

     

       411
       411
       +
           <listitem><para>

     

       412
       412
       +
             The propagated equivalent of <varname>depsBuildTarget</varname>.

     

       413
       413
       +
             This is prefixed for the same reason of alerting potential users.

     

       414
       414
       +
           </para></listitem>

     

       415
       415
       +
         </varlistentry>

     

       228
       416
        
       

     

       229
       417
        
         <varlistentry>

     

       230
       230
       -
           <term><varname>propagatedNativeBuildInputs</varname></term>

     

       418
       418
       +
           <term><varname>depsHostHostPropagated</varname></term>

     

       231
       419
        
           <listitem><para>

     

       232
       232
       -
             Like <varname>nativeBuildInputs</varname>, but these dependencies are <emphasis>propagated</emphasis>:

     

       233
       233
       -
             that is, the dependencies listed here are added to the <varname>nativeBuildInputs</varname> of any package that uses <emphasis>this</emphasis> package as a dependency.

     

       234
       234
       -
             So if package Y has <literal>propagatedNativeBuildInputs = [X]</literal>, and package Z has <literal>nativeBuildInputs = [Y]</literal>,

     

       235
       235
       -
             then package X will appear in Z’s build environment automatically.

     

       420
       420
       +
             The propagated equivalent of <varname>depsHostHost</varname>.

     

       236
       421
        
           </para></listitem>

     

       237
       422
        
         </varlistentry>

     

       238
       423
        
       

     

       239
       424
        
         <varlistentry>

     

       240
       425
        
           <term><varname>propagatedBuildInputs</varname></term>

     

       241
       426
        
           <listitem><para>

     

       242
       242
       -
             Like <varname>buildInputs</varname>, but propagated just like <varname>propagatedNativeBuildInputs</varname>.

     

       243
       243
       -
             This inherits <varname>buildInputs</varname>'s flaws of clobbering native executables when cross-compiling and being confusing for static linking.

     

       427
       427
       +
             The propagated equivalent of <varname>buildInputs</varname>.

     

       428
       428
       +
             This would be called <varname>depsHostTargetPropagated</varname> but for historical continuity.

     

       429
       429
       +
           </para></listitem>

     

       430
       430
       +
         </varlistentry>

     

       431
       431
       +
       

     

       432
       432
       +
         <varlistentry>

     

       433
       433
       +
           <term><varname>depsTargetTarget</varname></term>

     

       434
       434
       +
           <listitem><para>

     

       435
       435
       +
             The propagated equivalent of <varname>depsTargetTarget</varname>.

     

       436
       436
       +
             This is prefixed for the same reason of alerting potential users.

     

       437
       437
       +
           </para></listitem>

     

       438
       438
       +
         </varlistentry>

     

       439
       439
       +
       

     

       440
       440
       +
       </variablelist>

     

       441
       441
       +
       

     

       442
       442
       +
       </section>

     

       443
       443
       +
       

     

       444
       444
       +
       

     

       445
       445
       +
       <section xml:id="ssec-stdenv-attributes"><title>Attributes</title>

     

       446
       446
       +
       

     

       447
       447
       +
       <variablelist>

     

       448
       448
       +
         <title>Variables affecting <literal>stdenv</literal>

     

       449
       449
       +
         initialisation</title>

     

       450
       450
       +
       

     

       451
       451
       +
         <varlistentry>

     

       452
       452
       +
           <term><varname>NIX_DEBUG</varname></term>

     

       453
       453
       +
           <listitem><para>

     

       454
       454
       +
             A natural number indicating how much information to log.

     

       455
       455
       +
             If set to 1 or higher, <literal>stdenv</literal> will print moderate debug information during the build.

     

       456
       456
       +
             In particular, the <command>gcc</command> and <command>ld</command> wrapper scripts will print out the complete command line passed to the wrapped tools.

     

       457
       457
       +
             If set to 6 or higher, the <literal>stdenv</literal> setup script will be run with <literal>set -x</literal> tracing.

     

       458
       458
       +
             If set to 7 or higher, the <command>gcc</command> and <command>ld</command> wrapper scripts will also be run with <literal>set -x</literal> tracing.

     

       244
       459
        
           </para></listitem>

     

       245
       460
        
         </varlistentry>

     

       246
       461
        
       

     
···

       656
       871
        
             By default, when cross compiling, the configure script has <option>--build=...</option> and <option>--host=...</option> passed.

     

       657
       872
        
             Packages can instead pass <literal>[ "build" "host" "target" ]</literal> or a subset to control exactly which platform flags are passed.

     

       658
       873
        
             Compilers and other tools should use this to also pass the target platform, for example.

     

       659
       659
       -
             Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity.

     

       874
       874
       +
             <footnote><para>Eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity.</para></footnote>

     

       660
       875
        
           </para></listitem>

     

       661
       876
        
         </varlistentry>

     

       662
       877
        
       

     
···

       923
       1138
        
           <listitem><para>If set, libraries and executables are not

     

       924
       1139
        
           stripped.  By default, they are.</para></listitem>

     

       925
       1140
        
         </varlistentry>

     

       1141
       1141
       +
         <varlistentry>

     

       1142
       1142
       +
           <term><varname>dontStripHost</varname></term>

     

       1143
       1143
       +
           <listitem><para>

     

       1144
       1144
       +
             Like <varname>dontStripHost</varname>, but only affects the <command>strip</command> command targetting the package's host platform.

     

       1145
       1145
       +
             Useful when supporting cross compilation, but otherwise feel free to ignore.

     

       1146
       1146
       +
           </para></listitem>

     

       1147
       1147
       +
         </varlistentry>

     

       1148
       1148
       +
         <varlistentry>

     

       1149
       1149
       +
           <term><varname>dontStripTarget</varname></term>

     

       1150
       1150
       +
           <listitem><para>

     

       1151
       1151
       +
             Like <varname>dontStripHost</varname>, but only affects the <command>strip</command> command targetting the packages' target platform.

     

       1152
       1152
       +
             Useful when supporting cross compilation, but otherwise feel free to ignore.

     

       1153
       1153
       +
           </para></listitem>

     

       1154
       1154
       +
         </varlistentry>

     

       926
       1155
        
       

     

       927
       1156
        
         <varlistentry>

     

       928
       1157
        
           <term><varname>dontMoveSbin</varname></term>

     
···

       1353
       1582
        
       

     

       1354
       1583
        
       <section xml:id="ssec-setup-hooks"><title>Package setup hooks</title>

     

       1355
       1584
        
       

     

       1356
       1356
       -
       <para>The following packages provide a setup hook:

     

       1357
       1357
       -
       

     

       1585
       1585
       +
       <para>

     

       1586
       1586
       +
         Nix itself considers a build-time dependency merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup.

     

       1587
       1587
       +
         In most cases, that is fine, and the downstream derivation can deal with it's own dependencies.

     

       1588
       1588
       +
         But for a few common tasks, that would result in almost every package doing the same sort of setup work---depending not on the package itself, but entirely on which dependencies were used.

     

       1589
       1589
       +
       </para>

     

       1590
       1590
       +
       <para>

     

       1591
       1591
       +
         In order to alleviate this burden, the <firstterm>setup hook></firstterm>mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process.

     

       1592
       1592
       +
         That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves.

     

       1593
       1593
       +
         No boilerplate mirroring the list of dependencies is needed.

     

       1594
       1594
       +
       </para>

     

       1595
       1595
       +
       <para>

     

       1596
       1596
       +
         The Setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect.

     

       1597
       1597
       +
         The combination of its power and implicit use may be expedient, but isn't without costs.

     

       1598
       1598
       +
         Nix itself is unchanged, but the spirit of adding dependencies being effect-free is violated even if the letter isn't.

     

       1599
       1599
       +
         For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent.

     

       1600
       1600
       +
         However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable).

     

       1601
       1601
       +
         More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so.

     

       1602
       1602
       +
       </para>

     

       1603
       1603
       +
       <para>

     

       1604
       1604
       +
         The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency.

     

       1605
       1605
       +
         For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libaries and headers.

     

       1606
       1606
       +
         This is done by defining a bash function, and appending its name to one of

     

       1607
       1607
       +
         <envar>envBuildBuildHooks</envar>`,

     

       1608
       1608
       +
         <envar>envBuildHostHooks</envar>`,

     

       1609
       1609
       +
         <envar>envBuildTargetHooks</envar>`,

     

       1610
       1610
       +
         <envar>envHostHostHooks</envar>`,

     

       1611
       1611
       +
         <envar>envHostTargetHooks</envar>`, or

     

       1612
       1612
       +
         <envar>envTargetTargetHooks</envar>`.

     

       1613
       1613
       +
         These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).

     

       1614
       1614
       +
       </para>

     

       1615
       1615
       +
       <para>

     

       1616
       1616
       +
         Packages adding a hook should not hard code a specific hook, but rather choose a variable <emphasis>relative</emphasis> to how they are included.

     

       1617
       1617
       +
         Returning to the C compiler wrapper example, if it itself is an <literal>n</literal> dependency, then it only wants to accumulate flags from <literal>n + 1</literal> dependencies, as only those ones match the compiler's target platform.

     

       1618
       1618
       +
         The <envar>hostOffset</envar> variable is defined with the current dependency's host offset <envar>targetOffset</envar> with its target offset, before it's setup hook is sourced.

     

       1619
       1619
       +
         Additionally, since most environment hooks don't care about the target platform,

     

       1620
       1620
       +
         That means the setup hook can append to the right bash array by doing something like

     

       1621
       1621
       +
         <programlisting language="bash">

     

       1622
       1622
       +
       addEnvHooks "$hostOffset" myBashFunction

     

       1623
       1623
       +
         </programlisting>

     

       1624
       1624
       +
       </para>

     

       1625
       1625
       +
       <para>

     

       1626
       1626
       +
         The <emphasis>existence</emphasis> of setups hooks has long been documented and packages inside Nixpkgs are free to use these mechanism.

     

       1627
       1627
       +
         Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions.

     

       1628
       1628
       +
         Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time.

     

       1629
       1629
       +
       </para>

     

       1630
       1630
       +
       <para>

     

       1631
       1631
       +
         Here are some packages that provide a setup hook.

     

       1632
       1632
       +
         Since the mechanism is modular, this probably isn't an exhaustive list.

     

       1633
       1633
       +
         Then again, since the mechanism is only to be used as a last resort, it might be.

     

       1358
       1634
        
       <variablelist>

     

       1359
       1635
        
       

     

       1360
       1636
        
         <varlistentry>

     
···

       1421
       1697
        
       

     

       1422
       1698
        
         <varlistentry>

     

       1423
       1699
        
           <term>Perl</term>

     

       1424
       1424
       -
           <listitem><para>Adds the <filename>lib/site_perl</filename> subdirectory

     

       1425
       1425
       -
           of each build input to the <envar>PERL5LIB</envar>

     

       1426
       1426
       -
           environment variable.</para></listitem>

     

       1700
       1700
       +
           <listitem>

     

       1701
       1701
       +
             <para>

     

       1702
       1702
       +
               Adds the <filename>lib/site_perl</filename> subdirectory of each build input to the <envar>PERL5LIB</envar> environment variable.

     

       1703
       1703
       +
               For instance, if <varname>buildInputs</varname> contains Perl, then the <filename>lib/site_perl</filename> subdirectory of each input is added to the <envar>PERL5LIB</envar> environment variable.

     

       1704
       1704
       +
             </para>

     

       1705
       1705
       +
           </listitem>

     

       1427
       1706
        
         </varlistentry>

     

       1428
       1707
        
       

     

       1429
       1708
        
         <varlistentry>

+28

nixos/doc/manual/release-notes/rl-1803.xml

···

       20
       20
        
       <itemizedlist>

     

       21
       21
        
         <listitem>

     

       22
       22
        
           <para>

     

       23
       23
       +
             MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes

     

       24
       24
       +
             have been made to the infrastructure involved:

     

       25
       25
       +
             <itemizedlist>

     

       26
       26
       +
               <listitem>

     

       27
       27
       +
                 <para>

     

       28
       28
       +
                   <literal>libmysql</literal> has been deprecated, please use <literal>mysql.connector-c</literal>

     

       29
       29
       +
                   instead, a compatibility passthru has been added to the MySQL packages.

     

       30
       30
       +
                 </para>

     

       31
       31
       +
               </listitem>

     

       32
       32
       +
               <listitem>

     

       33
       33
       +
                 <para>

     

       34
       34
       +
                   The <literal>mysql57</literal> package has a new <literal>static</literal> output containing

     

       35
       35
       +
                   the static libraries including <literal>libmysqld.a</literal>

     

       36
       36
       +
                 </para>

     

       37
       37
       +
               </listitem>

     

       38
       38
       +
             </itemizedlist>

     

       23
       39
        
           </para>

     

       24
       40
        
         </listitem>

     

       25
       41
        
       </itemizedlist>

     
···

       101
       117
        
             The most commonly used files in <filename>nix-support</filename> are now split between the two wrappers.

     

       102
       118
        
             Some commonly used ones, like <filename>nix-support/dynamic-linker</filename>, are duplicated for backwards compatability, even though they rightly belong only in <literal>bintools-wrapper</literal>.

     

       103
       119
        
             Other more obscure ones are just moved.

     

       120
       120
       +
           </para>

     

       121
       121
       +
         </listitem>

     

       122
       122
       +
         <listitem>

     

       123
       123
       +
           <para>

     

       124
       124
       +
             The propagation logic has been changed.

     

       125
       125
       +
             The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual.

     

       126
       126
       +
             <!-- That's <xref linkend="ssec-stdenv-attributes"> were we to merge the manuals. -->

     

       127
       127
       +
             The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what.

     

       128
       128
       +
             In practice, that means that many <function>propagatedNativeBuildInputs</function> should instead be  <function>propagatedBuildInputs</function>.

     

       129
       129
       +
             Thankfully, that was and is the least used type of dependency.

     

       130
       130
       +
             Also, it means that some <function>propagatedBuildInputs</function> should instead be <function>depsTargetTargetPropagated</function>.

     

       131
       131
       +
             Other types dependencies should be unaffected.

     

       104
       132
        
           </para>

     

       105
       133
        
         </listitem>

     

       106
       134
        
       </itemizedlist>

+2 -2

nixos/modules/misc/ids.nix

···

       65
       65
        
             foldingathome = 37;

     

       66
       66
        
             sabnzbd = 38;

     

       67
       67
        
             #kdm = 39; # dropped in 17.03

     

       68
       68
       -
             ghostone = 40;

     

       68
       68
       +
             #ghostone = 40; # dropped in 18.03

     

       69
       69
        
             git = 41;

     

       70
       70
        
             fourstore = 42;

     

       71
       71
        
             fourstorehttp = 43;

     
···

       348
       348
        
             #foldingathome = 37; # unused

     

       349
       349
        
             #sabnzd = 38; # unused

     

       350
       350
        
             #kdm = 39; # unused, even before 17.03

     

       351
       351
       -
             ghostone = 40;

     

       351
       351
       +
             #ghostone = 40; # dropped in 18.03

     

       352
       352
        
             git = 41;

     

       353
       353
        
             fourstore = 42;

     

       354
       354
        
             fourstorehttp = 43;

-1

nixos/modules/module-list.nix

···

       220
       220
        
         ./services/editors/emacs.nix

     

       221
       221
        
         ./services/editors/infinoted.nix

     

       222
       222
        
         ./services/games/factorio.nix

     

       223
       223
       -
         ./services/games/ghost-one.nix

     

       224
       223
        
         ./services/games/minecraft-server.nix

     

       225
       224
        
         ./services/games/minetest-server.nix

     

       226
       225
        
         ./services/games/terraria.nix

+4 -13

nixos/modules/services/databases/mysql.nix

···

       7
       7
        
         cfg = config.services.mysql;

     

       8
       8
        
       

     

       9
       9
        
         mysql = cfg.package;

     

       10
       10
       -
         

     

       11
       11
       -
         isMariaDB = 

     

       10
       10
       +
       

     

       11
       11
       +
         isMariaDB =

     

       12
       12
        
           let

     

       13
       13
        
             pName = _p: (builtins.parseDrvName (_p.name)).name;

     

       14
       14
        
           in pName mysql == pName pkgs.mariadb;

     

       15
       15
       -
       

     

       16
       16
       -
         atLeast55 = versionAtLeast mysql.mysqlVersion "5.5";

     

       17
       15
        
       

     

       18
       16
        
         pidFile = "${cfg.pidDir}/mysqld.pid";

     

       19
       17
        
       

     
···

       28
       26
        
           ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }

     

       29
       27
        
           ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}

     

       30
       28
        
           ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}

     

       31
       31
       -
           ${optionalString (cfg.replication.role == "slave" && !atLeast55)

     

       32
       32
       -
           ''

     

       33
       33
       -
             master-host = ${cfg.replication.masterHost}

     

       34
       34
       -
             master-user = ${cfg.replication.masterUser}

     

       35
       35
       -
             master-password = ${cfg.replication.masterPassword}

     

       36
       36
       -
             master-port = ${toString cfg.replication.masterPort}

     

       37
       37
       -
           ''}

     

       38
       29
        
           ${optionalString (cfg.ensureUsers != [])

     

       39
       30
        
           ''

     

       40
       31
        
             plugin-load-add = auth_socket.so

     
···

       315
       306
        
                           fi

     

       316
       307
        
                         '') cfg.initialDatabases}

     

       317
       308
        
       

     

       318
       318
       -
                       ${optionalString (cfg.replication.role == "master" && atLeast55)

     

       309
       309
       +
                       ${optionalString (cfg.replication.role == "master")

     

       319
       310
        
                         ''

     

       320
       311
        
                           # Set up the replication master

     

       321
       312
        
       

     
···

       326
       317
        
                           ) | ${mysql}/bin/mysql -u root -N

     

       327
       318
        
                         ''}

     

       328
       319
        
       

     

       329
       329
       -
                       ${optionalString (cfg.replication.role == "slave" && atLeast55)

     

       320
       320
       +
                       ${optionalString (cfg.replication.role == "slave")

     

       330
       321
        
                         ''

     

       331
       322
        
                           # Set up the replication slave

     

       332
       323

-105

nixos/modules/services/games/ghost-one.nix

···

       1
       1
       -
       { config, lib, pkgs, ... }:

     

       2
       2
       -
       with lib;

     

       3
       3
       -
       let

     

       4
       4
       -
       

     

       5
       5
       -
         cfg = config.services.ghostOne;

     

       6
       6
       -
         ghostUser = "ghostone";

     

       7
       7
       -
         stateDir = "/var/lib/ghost-one";

     

       8
       8
       -
       

     

       9
       9
       -
       in

     

       10
       10
       -
       {

     

       11
       11
       -
       

     

       12
       12
       -
         ###### interface

     

       13
       13
       -
       

     

       14
       14
       -
         options = {

     

       15
       15
       -
           services.ghostOne = {

     

       16
       16
       -
       

     

       17
       17
       -
             enable = mkOption {

     

       18
       18
       -
               default = false;

     

       19
       19
       -
               description = "Enable Ghost-One Warcraft3 game hosting server.";

     

       20
       20
       -
             };

     

       21
       21
       -
       

     

       22
       22
       -
             language = mkOption {

     

       23
       23
       -
               default = "English";

     

       24
       24
       -
               type = types.enum [ "English" "Spanish" "Russian" "Serbian" "Turkish" ];

     

       25
       25
       -
               description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish.";

     

       26
       26
       -
             };

     

       27
       27
       -
       

     

       28
       28
       -
             war3path = mkOption {

     

       29
       29
       -
               default = "";

     

       30
       30
       -
               description = ''

     

       31
       31
       -
                 The path to your local Warcraft III directory, which must contain war3.exe, storm.dll, and game.dll.

     

       32
       32
       -
               '';

     

       33
       33
       -
             };

     

       34
       34
       -
       

     

       35
       35
       -
             mappath = mkOption {

     

       36
       36
       -
               default = "";

     

       37
       37
       -
               description = ''

     

       38
       38
       -
                 The path to the directory where you keep your map files. GHost One doesn't require

     

       39
       39
       -
                 map files but if it has access to them it can send them to players and automatically

     

       40
       40
       -
                 calculate most map config values. GHost One will search [bot_mappath + map_localpath]

     

       41
       41
       -
                 for the map file (map_localpath is set in each map's config file).

     

       42
       42
       -
               '';

     

       43
       43
       -
             };

     

       44
       44
       -
       

     

       45
       45
       -
             config = mkOption {

     

       46
       46
       -
               default = "";

     

       47
       47
       -
               description = "Extra configuration options.";

     

       48
       48
       -
             };

     

       49
       49
       -
       

     

       50
       50
       -
           };

     

       51
       51
       -
         };

     

       52
       52
       -
       

     

       53
       53
       -
         ###### implementation

     

       54
       54
       -
       

     

       55
       55
       -
         config = mkIf cfg.enable {

     

       56
       56
       -
       

     

       57
       57
       -
           users.extraUsers = singleton

     

       58
       58
       -
             { name = ghostUser;

     

       59
       59
       -
               uid = config.ids.uids.ghostone;

     

       60
       60
       -
               description = "Ghost One game server user";

     

       61
       61
       -
               home = stateDir;

     

       62
       62
       -
             };

     

       63
       63
       -
       

     

       64
       64
       -
           users.extraGroups = singleton

     

       65
       65
       -
             { name = ghostUser;

     

       66
       66
       -
               gid = config.ids.gids.ghostone;

     

       67
       67
       -
             };

     

       68
       68
       -
       

     

       69
       69
       -
           services.ghostOne.config = ''

     

       70
       70
       -
       #      bot_log = /dev/stderr

     

       71
       71
       -
             bot_language = ${pkgs.ghostOne}/share/ghost-one/languages/${cfg.language}.cfg

     

       72
       72
       -
             bot_war3path = ${cfg.war3path}

     

       73
       73
       -
       

     

       74
       74
       -
             bot_mapcfgpath = mapcfgs

     

       75
       75
       -
             bot_savegamepath = savegames

     

       76
       76
       -
             bot_mappath = ${cfg.mappath}

     

       77
       77
       -
             bot_replaypath = replays

     

       78
       78
       -
           '';

     

       79
       79
       -
       

     

       80
       80
       -
           systemd.services."ghost-one" = {

     

       81
       81
       -
             wantedBy = [ "multi-user.target" ];

     

       82
       82
       -
             script = ''

     

       83
       83
       -
               mkdir -p ${stateDir}

     

       84
       84
       -
               cd ${stateDir}

     

       85
       85
       -
               chown ${ghostUser}:${ghostUser} .

     

       86
       86
       -
       

     

       87
       87
       -
               mkdir -p mapcfgs

     

       88
       88
       -
               chown ${ghostUser}:${ghostUser} mapcfgs

     

       89
       89
       -
       

     

       90
       90
       -
               mkdir -p replays

     

       91
       91
       -
               chown ${ghostUser}:${ghostUser} replays

     

       92
       92
       -
       

     

       93
       93
       -
               mkdir -p savegames

     

       94
       94
       -
               chown ${ghostUser}:${ghostUser} savegames

     

       95
       95
       -
       

     

       96
       96
       -
               ln -sf ${pkgs.writeText "ghost.cfg" cfg.config} ghost.cfg

     

       97
       97
       -
               ln -sf ${pkgs.ghostOne}/share/ghost-one/ip-to-country.csv

     

       98
       98
       -
               ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${ghostUser} \

     

       99
       99
       -
                 -c "LANG=C ${pkgs.ghostOne}/bin/ghost++"

     

       100
       100
       -
             '';

     

       101
       101
       -
           };

     

       102
       102
       -
       

     

       103
       103
       -
         };

     

       104
       104
       -
       

     

       105
       105
       -
       }

+3 -2

pkgs/applications/audio/amarok/kf5.nix

···

       3
       3
        
       , qca-qt5, qjson, qtscript, qtwebkit

     

       4
       4
        
       , kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor

     

       5
       5
        
       , phonon, plasma-framework, threadweaver

     

       6
       6
       -
       , curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras

     

       6
       6
       +
       , curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       let

     
···

       26
       26
        
           qca-qt5 qjson qtscript qtwebkit

     

       27
       27
        
           kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor

     

       28
       28
        
           phonon plasma-framework threadweaver

     

       29
       29
       -
           curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras

     

       29
       29
       +
           curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static

     

       30
       30
       +
           pcre snappy taglib taglib_extras

     

       30
       31
        
         ];

     

       31
       32
        
         enableParallelBuilding = true;

     

       32
       33

+14 -9

pkgs/applications/gis/grass/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
       -
         name = "grass-7.0.2";

     

       7
       7
       +
         name = "grass-7.2.2";

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = http://grass.osgeo.org/grass70/source/grass-7.0.2.tar.gz;

     

       10
       10
       -
           sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf";

     

       9
       9
       +
           url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz;

     

       10
       10
       +
           sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       14
       14
        
         buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo

     

       15
       15
       -
         readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]

     

       15
       15
       +
         readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ]

     

       16
       16
        
           ++ (with python2Packages; [ python dateutil wxPython30 numpy ]);

     

       17
       17
        
       

     

       18
       18
        
         configureFlags = [

     
···

       22
       22
        
           "--with-wxwidgets"

     

       23
       23
        
           "--with-netcdf"

     

       24
       24
        
           "--with-geos"

     

       25
       25
       -
           "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/"

     

       25
       25
       +
           "--with-postgres"

     

       26
       26
       +
           "--with-postgres-libs=${postgresql.lib}/lib/"

     

       26
       27
        
           # it complains about missing libmysqld but doesn't really seem to need it

     

       27
       27
       -
           "--with-mysql" "--with-mysql-includes=${stdenv.lib.getDev mysql.client}/include/mysql"

     

       28
       28
       +
           "--with-mysql"

     

       29
       29
       +
           "--with-mysql-includes=${mysql.connector-c}/include/mysql"

     

       30
       30
       +
           "--with-mysql-libs=${mysql.connector-c}/lib/mysql"

     

       28
       31
        
           "--with-blas"

     

       29
       32
        
         ];

     

       30
       33
        
       

     
···

       40
       43
        
             scripts/r.pack/r.pack.py \

     

       41
       44
        
             scripts/r.tileset/r.tileset.py \

     

       42
       45
        
             scripts/r.unpack/r.unpack.py \

     

       43
       43
       -
             scripts/v.krige/v.krige.py \

     

       44
       46
        
             scripts/v.rast.stats/v.rast.stats.py \

     

       45
       47
        
             scripts/v.to.lines/v.to.lines.py \

     

       46
       48
        
             scripts/v.what.strds/v.what.strds.py \

     

       47
       49
        
             scripts/v.unpack/v.unpack.py \

     

       48
       50
        
             scripts/wxpyimgview/*.py \

     

       49
       51
        
             gui/wxpython/animation/g.gui.animation.py \

     

       52
       52
       +
             gui/wxpython/datacatalog/g.gui.datacatalog.py \

     

       50
       53
        
             gui/wxpython/rlisetup/g.gui.rlisetup.py \

     

       51
       54
        
             gui/wxpython/vdigit/g.gui.vdigit.py \

     

       52
       55
        
             temporal/t.rast.accumulate/t.rast.accumulate.py \

     

       53
       56
        
             temporal/t.rast.accdetect/t.rast.accdetect.py \

     

       57
       57
       +
             temporal/t.rast.algebra/t.rast.algebra.py \

     

       58
       58
       +
             temporal/t.rast3d.algebra/t.rast3d.algebra.py \

     

       59
       59
       +
             temporal/t.vect.algebra/t.vect.algebra.py \

     

       54
       60
        
             temporal/t.select/t.select.py

     

       55
       61
        
           for d in gui lib scripts temporal tools; do

     

       56
       62
        
             patchShebangs $d

     
···

       58
       64
        
         '';

     

       59
       65
        
       

     

       60
       66
        
         postInstall = ''

     

       61
       61
       -
           wrapProgram $out/bin/grass70 \

     

       67
       67
       +
           wrapProgram $out/bin/grass72 \

     

       62
       68
        
           --set PYTHONPATH $PYTHONPATH \

     

       63
       69
        
           --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \

     

       64
       70
        
           --suffix LD_LIBRARY_PATH ':' '${gdal}/lib'

     
···

       72
       78
        
           description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";

     

       73
       79
        
           license = stdenv.lib.licenses.gpl2Plus;

     

       74
       80
        
           platforms = stdenv.lib.platforms.all;

     

       75
       75
       -
           broken = true;

     

       76
       81
        
         };

     

       77
       82
        
       }

-1

pkgs/applications/graphics/digikam/default.nix

+2 -2

pkgs/applications/kde/kmime.nix

···

       10
       10
        
           license = [ lib.licenses.lgpl21 ];

     

       11
       11
        
           maintainers = kdepimTeam;

     

       12
       12
        
         };

     

       13
       13
       -
         nativeBuildInputs = [ extra-cmake-modules ki18n ];

     

       14
       14
       -
         buildInputs = [ kcodecs qtbase ];

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       14
       14
       +
         buildInputs = [ kcodecs ki18n qtbase ];

     

       15
       15
        
         outputs = [ "out" "dev" ];

     

       16
       16
        
       }

+2 -2

pkgs/applications/kde/libkcddb.nix

···

       8
       8
        
           license = with licenses; [ gpl2 lgpl21 bsd3 ];

     

       9
       9
        
           maintainers = with maintainers; [ peterhoeg ];

     

       10
       10
        
         };

     

       11
       11
       -
         nativeBuildInputs = [ extra-cmake-modules ];

     

       12
       12
       -
         buildInputs = [ qtbase kdoctools ];

     

       11
       11
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       12
       12
       +
         buildInputs = [ qtbase ];

     

       13
       13
        
         propagatedBuildInputs = [

     

       14
       14
        
           kcodecs ki18n kio kwidgetsaddons

     

       15
       15
        
           libmusicbrainz5

+6 -2

pkgs/applications/misc/deepin-terminal/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "deepin-terminal-${version}";

     
···

       25
       25
        
           substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh"

     

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
       -
         nativeBuildInputs = [ pkgconfig vala cmake gettext ];

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           pkgconfig vala cmake gettext

     

       30
       30
       +
           # For setup hook

     

       31
       31
       +
           gobjectIntrospection

     

       32
       32
       +
         ];

     

       29
       33
        
         buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ];

     

       30
       34
        
       

     

       31
       35
        
         meta = with stdenv.lib; {

+4 -3

pkgs/applications/misc/font-manager/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,

     

       1
       1
       +
       { stdenv, fetchFromGitHub, automake, autoconf, libtool,

     

       2
       2
        
         pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,

     

       3
       3
       -
         librsvg, vala_0_34, gnome3, wrapGAppsHook

     

       3
       3
       +
         librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       15
       15
        
           };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [

     

       18
       18
       -
           makeWrapper

     

       19
       18
        
           pkgconfig

     

       20
       19
        
           automake autoconf libtool

     

       21
       20
        
           file

     
···

       23
       22
        
           vala_0_34

     

       24
       23
        
           gnome3.yelp_tools

     

       25
       24
        
           wrapGAppsHook

     

       25
       25
       +
           # For setup hook

     

       26
       26
       +
           gobjectIntrospection

     

       26
       27
        
         ];

     

       27
       28
        
       

     

       28
       29
        
         buildInputs = [

+16 -8

pkgs/applications/misc/haxor-news/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pythonPackages }:

     

       1
       1
       +
       { stdenv, fetchurl, python }:

     

       2
       2
        
       

     

       3
       3
       -
       pythonPackages.buildPythonApplication rec {

     

       4
       4
       -
         version = "0.4.2";

     

       5
       5
       -
         name = "haxor-news-${version}";

     

       3
       3
       +
       with python.pkgs;

     

       6
       4
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";

     

       9
       9
       -
           sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs";

     

       5
       5
       +
       buildPythonApplication rec {

     

       6
       6
       +
         pname = "haxor-news";

     

       7
       7
       +
         version = "0.4.3";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchPypi {

     

       10
       10
       +
           inherit pname version;

     

       11
       11
       +
           sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       12
       -
         propagatedBuildInputs = with pythonPackages; [

     

       14
       14
       +
         propagatedBuildInputs = [

     

       13
       15
        
           click

     

       14
       16
        
           colorama

     

       15
       17
        
           requests

     
···

       17
       19
        
           prompt_toolkit

     

       18
       20
        
           six

     

       19
       21
        
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         checkInputs = [ mock ];

     

       24
       24
       +
       

     

       25
       25
       +
         checkPhase = ''

     

       26
       26
       +
           ${python.interpreter} -m unittest discover -s tests -v

     

       27
       27
       +
         '';

     

       20
       28
        
       

     

       21
       29
        
         meta = with stdenv.lib; {

     

       22
       30
        
           homepage = https://github.com/donnemartin/haxor-news;

+6 -1

pkgs/applications/misc/kupfer/default.nix

···

       3
       3
        
       , fetchurl

     

       4
       4
        
       , intltool

     

       5
       5
        
       , python3Packages

     

       6
       6
       +
       , gobjectIntrospection

     

       6
       7
        
       , gtk3

     

       7
       8
        
       , dbus

     

       8
       9
        
       , libwnck3

     
···

       22
       23
        
           sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       25
       -
         nativeBuildInputs = [ wrapGAppsHook intltool ];

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           wrapGAppsHook intltool

     

       28
       28
       +
           # For setup hook

     

       29
       29
       +
           gobjectIntrospection

     

       30
       30
       +
         ];

     

       26
       31
        
         buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ];

     

       27
       32
        
         propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];

     

       28
       33

+6 -2

pkgs/applications/misc/pdfpc/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee

     

       2
       2
       -
       , poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }:

     

       2
       2
       +
       , poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "${product}-${version}";

     
···

       13
       13
        
           sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ cmake pkgconfig vala ];

     

       16
       16
       +
         nativeBuildInputs = [

     

       17
       17
       +
           cmake pkgconfig vala

     

       18
       18
       +
           # For setup hook

     

       19
       19
       +
           gobjectIntrospection

     

       20
       20
       +
         ];

     

       17
       21
        
         buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler

     

       18
       22
        
           libpthreadstubs makeWrapper librsvg pcre ];

     

       19
       23

+6 -2

pkgs/applications/misc/synapse/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee

     

       2
       2
       -
       , keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme

     

       2
       2
       +
       , keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme, gobjectIntrospection

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       12
       12
        
           sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ pkgconfig intltool vala_0_34 ];

     

       15
       15
       +
         nativeBuildInputs = [

     

       16
       16
       +
           pkgconfig intltool vala_0_34

     

       17
       17
       +
           # For setup hook

     

       18
       18
       +
           gobjectIntrospection

     

       19
       19
       +
         ];

     

       16
       20
        
         buildInputs = [

     

       17
       21
        
           glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist

     

       18
       22
        
           hicolor_icon_theme

+7 -3

pkgs/applications/misc/valauncher/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3 }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3, gobjectIntrospection }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "1.3.1";

     
···

       11
       11
        
           sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkgconfig ];

     

       15
       15
       -
         buildInputs = [ cmake gtk3 vala gnome3.libgee ];

     

       14
       14
       +
         nativeBuildInputs = [

     

       15
       15
       +
           cmake vala pkgconfig

     

       16
       16
       +
           # For setup hook

     

       17
       17
       +
           gobjectIntrospection

     

       18
       18
       +
         ];

     

       19
       19
       +
         buildInputs = [ gtk3 gnome3.libgee ];

     

       16
       20
        
       

     

       17
       21
        
         meta = with stdenv.lib; {

     

       18
       22
        
             description = "A fast dmenu-like gtk3 application launcher";

+3 -3

pkgs/applications/networking/browsers/lynx/default.nix

···

       22
       22
        
       

     

       23
       23
        
         configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";

     

       24
       24
        
       

     

       25
       25
       -
         nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig

     

       26
       26
       -
           ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc

     

       27
       27
       -
           ++ [ nukeReferences ];

     

       25
       25
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       26
       26
       +
         nativeBuildInputs = [ nukeReferences ]

     

       27
       27
       +
           ++ stdenv.lib.optional sslSupport pkgconfig;

     

       28
       28
        
       

     

       29
       29
        
         buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;

     

       30
       30

+2 -2

pkgs/applications/office/kexi/default.nix

···

       4
       4
        
         breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,

     

       5
       5
        
         kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,

     

       6
       6
        
         kwidgetsaddons, kxmlgui,

     

       7
       7
       -
         kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql

     

       7
       7
       +
         kdb, kproperty, kreport, lcms2, mysql, marble, postgresql

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       mkDerivation rec {

     
···

       24
       24
        
           breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons

     

       25
       25
        
           kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets

     

       26
       26
        
           kwidgetsaddons kxmlgui

     

       27
       27
       -
           kdb kproperty kreport lcms2 libmysql marble postgresql

     

       27
       27
       +
           kdb kproperty kreport lcms2 mysql.connector-c marble postgresql

     

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
        
         propagatedUserEnvPkgs = [ kproperty ];

+5 -2

pkgs/applications/office/skrooge/default.nix

···

       14
       14
        
           sha256 = "1dbvdrkdpgv39v8h7k3mri0nzlslfyd5kk410czj0jdn4qq400md";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ cmake extra-cmake-modules shared_mime_info ];

     

       17
       17
       +
         nativeBuildInputs = [

     

       18
       18
       +
           cmake extra-cmake-modules kdoctools shared_mime_info

     

       19
       19
       +
         ];

     

       18
       20
        
       

     

       19
       19
       -
         buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           qtwebkit qtscript grantlee kxmlgui kwallet kparts

     

       20
       23
        
           kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5

     

       21
       24
        
           kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx

     

       22
       25
        
         ];

+18 -9

pkgs/applications/office/watson/default.nix

···

       1
       1
       -
       { stdenv, pythonPackages }:

     

       1
       1
       +
       { stdenv, pythonPackages, fetchpatch }:

     

       2
       2
       +
       

     

       3
       3
       +
       with pythonPackages;

     

       2
       4
        
       

     

       3
       3
       -
       pythonPackages.buildPythonApplication rec {

     

       5
       5
       +
       buildPythonApplication rec {

     

       4
       6
        
         pname = "td-watson";

     

       5
       5
       -
         name = "${pname}-${version}";

     

       6
       6
       -
         version = "1.4.0";

     

       7
       7
       +
         version = "1.5.2";

     

       7
       8
        
       

     

       8
       8
       -
         src = pythonPackages.fetchPypi {

     

       9
       9
       +
         src = fetchPypi {

     

       9
       10
        
           inherit version pname;

     

       10
       10
       -
           sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq";

     

       11
       11
       +
           sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         # uses tox, test invocation fails

     
···

       15
       16
        
         checkPhase = ''

     

       16
       17
        
           py.test -vs tests

     

       17
       18
        
        '';

     

       18
       18
       -
         checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];

     

       19
       19
       -
         propagatedBuildInputs = with pythonPackages; [ requests click arrow ];

     

       19
       19
       +
       

     

       20
       20
       +
         patches = [

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch;

     

       23
       23
       +
             sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g";

     

       24
       24
       +
           })

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];

     

       28
       28
       +
         propagatedBuildInputs = [ requests click arrow ];

     

       20
       29
        
       

     

       21
       30
        
         meta = with stdenv.lib; {

     

       22
       31
        
           homepage = https://tailordev.github.io/Watson/;

     
···

       24
       33
        
           license = licenses.mit;

     

       25
       34
        
           maintainers = with maintainers; [ mguentner ] ;

     

       26
       35
        
         };

     

       27
       27
       -
       }
     

       36
       36
       +
       }

+1 -1

pkgs/applications/science/logic/coq/8.4.nix

···

       60
       60
        
             fi

     

       61
       61
        
           }

     

       62
       62
        
       

     

       63
       63
       -
           envHooks=(''${envHooks[@]} addCoqPath)

     

       63
       63
       +
           addEnvHooks "$targetOffset" addCoqPath

     

       64
       64
        
         '';

     

       65
       65
        
       

     

       66
       66
        
         passthru = {

+1 -1

pkgs/applications/science/logic/coq/default.nix

···

       110
       110
        
             fi

     

       111
       111
        
           }

     

       112
       112
        
       

     

       113
       113
       -
           envHooks=(''${envHooks[@]} addCoqPath)

     

       113
       113
       +
           addEnvHooks "$targetOffset" addCoqPath

     

       114
       114
        
         '';

     

       115
       115
        
       

     

       116
       116
        
         preConfigure = ''

+4 -2

pkgs/applications/science/math/R/setup-hook.sh

···

       1
       1
        
       addRLibPath () {

     

       2
       2
       -
           addToSearchPath R_LIBS_SITE $1/library

     

       2
       2
       +
           if [[ -d "$1/library" ]]; then

     

       3
       3
       +
               addToSearchPath R_LIBS_SITE "$1/library"

     

       4
       4
       +
           fi

     

       3
       5
        
       }

     

       4
       6
        
       

     

       5
       5
       -
       envHooks+=(addRLibPath)

     

       7
       7
       +
       addEnvHooks "$targetOffset" addRLibPath

+1 -1

pkgs/applications/science/math/glsurf/default.nix

···

       10
       10
        
           sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ freeglut mesa mysql.lib mpfr gmp

     

       13
       13
       +
         buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp

     

       14
       14
        
           libtiff libjpeg libpng giflib ]

     

       15
       15
        
         ++ (with ocamlPackages; [

     

       16
       16
        
           ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl

+1 -1

pkgs/applications/video/kodi/default.nix

···

       130
       130
        
             libmpeg2 libsamplerate libmad

     

       131
       131
        
             libogg libvorbis flac libxslt systemd

     

       132
       132
        
             lzo libcdio libmodplug libass libbluray

     

       133
       133
       -
             sqlite mysql.lib avahi lame

     

       133
       133
       +
             sqlite mysql.connector-c avahi lame

     

       134
       134
        
             curl bzip2 zip unzip glxinfo xdpyinfo

     

       135
       135
        
             libcec libcec_platform dcadec libuuid

     

       136
       136
        
             libgcrypt libgpgerror libunistring

+2 -1

pkgs/applications/video/mplayer/default.nix

···

       102
       102
        
           rm -rf ffmpeg

     

       103
       103
        
         '';

     

       104
       104
        
       

     

       105
       105
       -
         nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ];

     

       105
       105
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       106
       106
       +
         nativeBuildInputs = [ pkgconfig yasm ];

     

       106
       107
        
         buildInputs = with stdenv.lib;

     

       107
       108
        
           [ freetype ffmpeg ]

     

       108
       109
        
           ++ optional aalibSupport aalib

+15 -1

pkgs/build-support/bintools-wrapper/default.nix

···

       164
       164
        
             set +u

     

       165
       165
        
           '';

     

       166
       166
        
       

     

       167
       167
       -
         propagatedBuildInputs = extraPackages;

     

       167
       167
       +
         emulation = let

     

       168
       168
       +
           fmt =

     

       169
       169
       +
             /**/ if targetPlatform.isDarwin  then "mach-o"

     

       170
       170
       +
             else if targetPlatform.isWindows then "pe"

     

       171
       171
       +
             else "elf" + toString targetPlatform.parsed.cpu.bits;

     

       172
       172
       +
           endianPrefix = if targetPlatform.isBigEndian then "big" else "little";

     

       173
       173
       +
           arch =

     

       174
       174
       +
             /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"

     

       175
       175
       +
             else if targetPlatform.isArm     then endianPrefix + "arm"

     

       176
       176
       +
             else if targetPlatform.isx86_64  then "x86-64"

     

       177
       177
       +
             else if targetPlatform.isi686    then "i386"

     

       178
       178
       +
             else throw "unknown emulation for platform: " + targetPlatform.config;

     

       179
       179
       +
           in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch);

     

       180
       180
       +
       

     

       181
       181
       +
         depsTargetTargetPropagated = extraPackages;

     

       168
       182
        
       

     

       169
       183
        
         setupHook = ./setup-hook.sh;

     

       170
       184

+5

pkgs/build-support/bintools-wrapper/ld-wrapper.sh

···

       67
       67
        
       

     

       68
       68
        
       extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER)

     

       69
       69
        
       

     

       70
       70
       +
       # Specify the target emulation if nothing is passed in ("-m" overrides this

     

       71
       71
       +
       # environment variable). Ensures we never blindly fallback on targeting the host

     

       72
       72
       +
       # platform.

     

       73
       73
       +
       : ${LDEMULATION:=@emulation@}

     

       74
       74
       +
       

     

       70
       75
        
       # Three tasks:

     

       71
       76
        
       #

     

       72
       77
        
       #   1. Find all -L... switches for rpath

+33 -12

pkgs/build-support/bintools-wrapper/setup-hook.sh

···

       2
       2
        
       #

     

       3
       3
        
       # See comments in cc-wrapper's setup hook. This works exactly the same way.

     

       4
       4
        
       

     

       5
       5
       +
       set -u

     

       6
       6
       +
       

     

       7
       7
       +
       # Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a

     

       8
       8
       +
       # native compile.

     

       9
       9
       +
       #

     

       10
       10
       +
       # TODO(@Ericson2314): No native exception

     

       11
       11
       +
       [[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0

     

       12
       12
       +
       

     

       5
       13
        
       bintoolsWrapper_addLDVars () {

     

       6
       6
       -
           case $depOffset in

     

       14
       14
       +
           case $depHostOffset in

     

       7
       15
        
               -1) local role='BUILD_' ;;

     

       8
       16
        
               0)  local role='' ;;

     

       9
       17
        
               1)  local role='TARGET_' ;;

     

       10
       10
       -
               *)  echo "bintools-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2;

     

       18
       18
       +
               *)  echo "bintools-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;

     

       11
       19
        
                   return 1 ;;

     

       12
       20
        
           esac

     

       13
       21
        
       

     
···

       20
       28
        
           fi

     

       21
       29
        
       }

     

       22
       30
        
       

     

       23
       23
       -
       if [ -n "${crossConfig:-}" ]; then

     

       24
       24
       -
           export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1

     

       25
       25
       -
           role_pre='BUILD_'

     

       26
       26
       -
           role_post='_FOR_BUILD'

     

       27
       27
       -
       else

     

       28
       28
       -
           export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1

     

       29
       29
       -
           role_pre=""

     

       30
       30
       -
           role_post=''

     

       31
       31
       -
       fi

     

       31
       31
       +
       case $targetOffset in

     

       32
       32
       +
           -1)

     

       33
       33
       +
               export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1

     

       34
       34
       +
               role_pre='BUILD_'

     

       35
       35
       +
               role_post='_FOR_BUILD'

     

       36
       36
       +
               ;;

     

       37
       37
       +
           0)

     

       38
       38
       +
               export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1

     

       39
       39
       +
               role_pre=''

     

       40
       40
       +
               role_post=''

     

       41
       41
       +
               ;;

     

       42
       42
       +
           1)

     

       43
       43
       +
               export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET=1

     

       44
       44
       +
               role_pre='TARGET_'

     

       45
       45
       +
               role_post='_FOR_TARGET'

     

       46
       46
       +
               ;;

     

       47
       47
       +
           *)

     

       48
       48
       +
               echo "cc-wrapper: used as improper sort of dependency" >2;

     

       49
       49
       +
               return 1

     

       50
       50
       +
               ;;

     

       51
       51
       +
       esac

     

       32
       52
        
       

     

       33
       33
       -
       envHooks+=(bintoolsWrapper_addLDVars)

     

       53
       53
       +
       addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars

     

       34
       54
        
       

     

       35
       55
        
       # shellcheck disable=SC2157

     

       36
       56
        
       if [ -n "@bintools_bin@" ]; then

     
···

       65
       85
        
       

     

       66
       86
        
       # No local scope in sourced file

     

       67
       87
        
       unset -v role_pre role_post cmd upper_case

     

       88
       88
       +
       set +u

+2 -1

pkgs/build-support/cc-wrapper/default.nix

···

       201
       201
        
             ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl

     

       202
       202
        
           '';

     

       203
       203
        
       

     

       204
       204
       -
         propagatedBuildInputs = [ bintools ] ++ extraPackages;

     

       204
       204
       +
         propagatedBuildInputs = [ bintools ];

     

       205
       205
       +
         depsTargetTargetPropagated = extraPackages;

     

       205
       206
        
       

     

       206
       207
        
         setupHook = ./setup-hook.sh;

     

       207
       208

+37 -18

pkgs/build-support/cc-wrapper/setup-hook.sh

···

       54
       54
        
       # For more details, read the individual files where the mechanisms used to

     

       55
       55
        
       # accomplish this will be individually documented.

     

       56
       56
        
       

     

       57
       57
       +
       set -u

     

       58
       58
       +
       

     

       59
       59
       +
       # Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a

     

       60
       60
       +
       # native compile.

     

       61
       61
       +
       #

     

       62
       62
       +
       # TODO(@Ericson2314): No native exception

     

       63
       63
       +
       [[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0

     

       57
       64
        
       

     

       58
       65
        
       # It's fine that any other cc-wrapper will redefine this. Bash functions close

     

       59
       66
        
       # over no state, and there's no @-substitutions within, so any redefined

     

       60
       67
        
       # function is guaranteed to be exactly the same.

     

       61
       68
        
       ccWrapper_addCVars () {

     

       62
       62
       -
           # The `depOffset` describes how the platforms of the dependencies are slid

     

       63
       63
       -
           # relative to the depending package. It is brought into scope of the

     

       64
       64
       -
           # environment hook defined as the role of the dependency being applied.

     

       65
       65
       -
           case $depOffset in

     

       69
       69
       +
           # The `depHostOffset` describes how the host platform of the dependencies

     

       70
       70
       +
           # are slid relative to the depending package. It is brought into scope of

     

       71
       71
       +
           # the environment hook defined as the role of the dependency being applied.

     

       72
       72
       +
           case $depHostOffset in

     

       66
       73
        
               -1) local role='BUILD_' ;;

     

       67
       74
        
               0)  local role='' ;;

     

       68
       75
        
               1)  local role='TARGET_' ;;

     

       69
       69
       -
               *)  echo "cc-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2;

     

       76
       76
       +
               *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;

     

       70
       77
        
                   return 1 ;;

     

       71
       78
        
           esac

     

       72
       79
        
       

     
···

       87
       94
        
       #

     

       88
       95
        
       # We also need to worry about what role is being added on *this* invocation of

     

       89
       96
        
       # setup-hook, which `role` tracks.

     

       90
       90
       -
       if [ -n "${crossConfig:-}" ]; then

     

       91
       91
       -
           export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1

     

       92
       92
       -
           role_pre='BUILD_'

     

       93
       93
       -
           role_post='_FOR_BUILD'

     

       94
       94
       -
       else

     

       95
       95
       -
           export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1

     

       96
       96
       -
           role_pre=''

     

       97
       97
       -
           role_post=''

     

       98
       98
       -
       fi

     

       97
       97
       +
       case $targetOffset in

     

       98
       98
       +
           -1)

     

       99
       99
       +
               export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1

     

       100
       100
       +
               role_pre='BUILD_'

     

       101
       101
       +
               role_post='_FOR_BUILD'

     

       102
       102
       +
               ;;

     

       103
       103
       +
           0)

     

       104
       104
       +
               export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1

     

       105
       105
       +
               role_pre=''

     

       106
       106
       +
               role_post=''

     

       107
       107
       +
               ;;

     

       108
       108
       +
           1)

     

       109
       109
       +
               export NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET=1

     

       110
       110
       +
               role_pre='TARGET_'

     

       111
       111
       +
               role_post='_FOR_TARGET'

     

       112
       112
       +
               ;;

     

       113
       113
       +
           *)

     

       114
       114
       +
               echo "cc-wrapper: used as improper sort of dependency" >2;

     

       115
       115
       +
               return 1

     

       116
       116
       +
               ;;

     

       117
       117
       +
       esac

     

       99
       118
        
       

     

       100
       100
       -
       # Eventually the exact sort of env-hook we create will depend on the role. This

     

       101
       101
       -
       # is because based on what relative platform we are targeting, we use different

     

       102
       102
       -
       # dependencies.

     

       103
       103
       -
       envHooks+=(ccWrapper_addCVars)

     

       119
       119
       +
       # We use the `targetOffset` to choose the right env hook to accumulate the right

     

       120
       120
       +
       # sort of deps (those with that offset).

     

       121
       121
       +
       addEnvHooks "$targetOffset" ccWrapper_addCVars

     

       104
       122
        
       

     

       105
       123
        
       # Note 1: these come *after* $out in the PATH (see setup.sh).

     

       106
       124
        
       # Note 2: phase separation makes this look useless to shellcheck.

     
···

       131
       149
        
       

     

       132
       150
        
       # No local scope in sourced file

     

       133
       151
        
       unset -v role_pre role_post

     

       152
       152
       +
       set +u

+5 -1

pkgs/build-support/emacs/setup-hook.sh

···

       4
       4
        
         fi

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
       -
       envHooks+=(addEmacsVars)

     

       7
       7
       +
       # If this is for a wrapper derivation, emacs and the dependencies are all

     

       8
       8
       +
       # run-time dependencies. If this is for precompiling packages into bytecode,

     

       9
       9
       +
       # emacs is a compile-time dependency of the package.

     

       10
       10
       +
       addEnvHooks "$targetOffset" addEmacsVars

     

       11
       11
       +
       addEnvHooks "$targetOffset" addEmacsVars

+2 -2

pkgs/build-support/gcc-wrapper-old/setup-hook.sh

···

       1
       1
       -
       addCVars () {

     

       1
       1
       +
       gccWrapperOld_addCVars () {

     

       2
       2
        
           if test -d $1/include; then

     

       3
       3
        
               export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include"

     

       4
       4
        
           fi

     
···

       12
       12
        
           fi

     

       13
       13
        
       }

     

       14
       14
        
       

     

       15
       15
       -
       envHooks=(${envHooks[@]} addCVars)

     

       15
       15
       +
       envBuildBuildHooks+=(gccWrapperOld_addCVars)

     

       16
       16
        
       

     

       17
       17
        
       # Note: these come *after* $out in the PATH (see setup.sh).

     

       18
       18

+1 -1

pkgs/build-support/setup-hooks/find-xml-catalogs.sh

···

       18
       18
        
           # xmllint and xsltproc from looking in /etc/xml/catalog.

     

       19
       19
        
           export XML_CATALOG_FILES

     

       20
       20
        
           if [ -z "$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES=" "; fi

     

       21
       21
       -
           envHooks+=(addXMLCatalogs)

     

       21
       21
       +
           addEnvHooks "$hostOffset" addXMLCatalogs

     

       22
       22
        
       fi

+1 -1

pkgs/build-support/setup-hooks/set-java-classpath.sh

···

       10
       10
        
           done

     

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
       -
       envHooks+=(addPkgToClassPath)

     

       13
       13
       +
       addEnvHooks "$targetOffset" addPkgToClassPath

+1 -1

pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh

···

       2
       2
        
           addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(setupDebugInfoDirs)

     

       5
       5
       +
       addEnvHooks "$targetOffset" setupDebugInfoDirs

+29 -8

pkgs/build-support/setup-hooks/strip.sh

···

       3
       3
        
       fixupOutputHooks+=(_doStrip)

     

       4
       4
        
       

     

       5
       5
        
       _doStrip() {

     

       6
       6
       -
           if [ -z "$dontStrip" ]; then

     

       6
       6
       +
           # We don't bother to strip build platform code because it shouldn't make it

     

       7
       7
       +
           # to $out anyways---if it does, that's a bigger problem that a lack of

     

       8
       8
       +
           # stripping will help catch.

     

       9
       9
       +
           local -ra flags=(dontStripHost dontStripTarget)

     

       10
       10
       +
           local -ra stripCmds=(STRIP TARGET_STRIP)

     

       11
       11
       +
       

     

       12
       12
       +
           # Optimization

     

       13
       13
       +
           if [[ "$STRIP" == "$TARGET_STRIP" ]]; then

     

       14
       14
       +
               dontStripTarget+=1

     

       15
       15
       +
           fi

     

       16
       16
       +
       

     

       17
       17
       +
           local i

     

       18
       18
       +
           for i in ${!stripCmds[@]}; do

     

       19
       19
       +
               local -n flag="${flags[$i]}"

     

       20
       20
       +
               local -n stripCmd="${stripCmds[$i]}"

     

       21
       21
       +
       

     

       22
       22
       +
               # `dontStrip` disables them all

     

       23
       23
       +
               if [[ "$dontStrip" || "$flag" ]] || ! type -f "$stripCmd" 2>/dev/null

     

       24
       24
       +
               then continue; fi

     

       25
       25
       +
       

     

       7
       26
        
               stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}

     

       8
       27
        
               if [ -n "$stripDebugList" ]; then

     

       9
       9
       -
                   stripDirs "$stripDebugList" "${stripDebugFlags:--S}"

     

       28
       28
       +
                   stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:--S}"

     

       10
       29
        
               fi

     

       11
       30
        
       

     

       12
       31
        
               stripAllList=${stripAllList:-}

     

       13
       32
        
               if [ -n "$stripAllList" ]; then

     

       14
       14
       -
                   stripDirs "$stripAllList" "${stripAllFlags:--s}"

     

       33
       33
       +
                   stripDirs "$stripCmd" "$stripAllList" "${stripAllFlags:--s}"

     

       15
       34
        
               fi

     

       16
       16
       -
           fi

     

       35
       35
       +
           done

     

       17
       36
        
       }

     

       18
       37
        
       

     

       19
       38
        
       stripDirs() {

     

       20
       20
       -
           local dirs="$1"

     

       21
       21
       -
           local stripFlags="$2"

     

       39
       39
       +
           local cmd="$1"

     

       40
       40
       +
           local dirs="$2"

     

       41
       41
       +
           local stripFlags="$3"

     

       22
       42
        
           local dirsNew=

     

       23
       43
        
       

     

       44
       44
       +
           local d

     

       24
       45
        
           for d in ${dirs}; do

     

       25
       46
        
               if [ -d "$prefix/$d" ]; then

     

       26
       47
        
                   dirsNew="${dirsNew} $prefix/$d "

     
···

       29
       50
        
           dirs=${dirsNew}

     

       30
       51
        
       

     

       31
       52
        
           if [ -n "${dirs}" ]; then

     

       32
       32
       -
               header "stripping (with flags $stripFlags) in$dirs"

     

       33
       33
       -
               find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $STRIP $commonStripFlags $stripFlags 2>/dev/null || true

     

       53
       53
       +
               header "stripping (with command $cmd and flags $stripFlags) in$dirs"

     

       54
       54
       +
               find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $cmd $commonStripFlags $stripFlags 2>/dev/null || true

     

       34
       55
        
               stopNest

     

       35
       56
        
           fi

     

       36
       57
        
       }

+1 -1

pkgs/build-support/setup-hooks/wrap-gapps-hook.sh

···

       6
       6
        
           fi

     

       7
       7
        
       }

     

       8
       8
        
       

     

       9
       9
       -
       envHooks+=(find_gio_modules)

     

       9
       9
       +
       addEnvHooks "$targetOffset" find_gio_modules

     

       10
       10
        
       

     

       11
       11
        
       # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.

     

       12
       12
        
       wrapGAppsHook() {

+2 -1

pkgs/data/icons/hicolor-icon-theme/setup-hook.sh

···

       8
       8
        
       	

     

       9
       9
        
       }

     

       10
       10
        
       

     

       11
       11
       -
       envHooks+=(hicolorIconThemeHook)

     

       11
       11
       +
       # I think this is meant to be a runtime dep

     

       12
       12
       +
       addEnvHooks "$hostOffset" hicolorIconThemeHook

     

       12
       13
        
       

     

       13
       14
        
       # Remove icon cache

     

       14
       15
        
       hicolorPreFixupPhase() {

+3 -3

pkgs/desktops/gnome-3/apps/gnome-characters/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook

     

       2
       2
       -
       , intltool, gjs, gdk_pixbuf, librsvg }:

     

       2
       2
       +
       , intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
       -
         nativeBuildInputs = [ pkgconfig ];

     

       7
       7
       +
         nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];

     

       8
       8
        
         buildInputs = [

     

       9
       9
       -
           gtk3 wrapGAppsHook intltool gjs gdk_pixbuf

     

       9
       9
       +
           gtk3 gjs gdk_pixbuf gobjectIntrospection

     

       10
       10
        
           librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme

     

       11
       11
        
         ];

     

       12
       12

+2 -2

pkgs/desktops/gnome-3/core/eog/default.nix

···

       1
       1
        
       { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3

     

       2
       2
       -
       , shared_mime_info, wrapGAppsHook, librsvg, libexif }:

     

       2
       2
       +
       , shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
       -
         nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];

     

       7
       7
       +
         nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ];

     

       8
       8
        
       

     

       9
       9
        
         buildInputs = with gnome3;

     

       10
       10
        
           [ libxml2 libjpeg gtk glib libpeas librsvg

+2 -2

pkgs/desktops/gnome-3/core/gconf/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2

     

       2
       2
       -
       , intltool, polkit, orbit, withGtk ? false }:

     

       2
       2
       +
       , intltool, polkit, orbit, python, withGtk ? false }:

     

       3
       3
        
       

     

       4
       4
        
       assert withGtk -> (gnome3 != null);

     

       5
       5
        
       

     
···

       18
       18
        
           sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;

     

       21
       21
       +
         buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk;

     

       22
       22
        
         propagatedBuildInputs = [ glib dbus_glib  ];

     

       23
       23
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       24
       24

+2 -2

pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib

     

       2
       2
       -
       , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }:

     

       2
       2
       +
       , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       6
        
       

     

       7
       7
       -
         nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ];

     

       7
       7
       +
         nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ];

     

       8
       8
        
         buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3

     

       9
       9
        
                         gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ];

     

       10
       10

+1 -1

pkgs/desktops/gnome-3/core/grilo/setup-hook.sh

···

       4
       4
        
           fi

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
       -
       envHooks+=(make_grilo_find_plugins)

     

       7
       7
       +
       addEnvHooks "$hostOffset" make_grilo_find_plugins

+7 -5

pkgs/desktops/gnome-3/core/gtksourceview/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango

     

       2
       2
       -
       , libxml2, perl, intltool, gettext, gnome3, dbus, xvfb_run, shared_mime_info }:

     

       2
       2
       +
       , libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }:

     

       3
       3
        
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       4
       4
       +
       let

     

       5
       5
       +
         checkInputs = [ xvfb_run dbus ];

     

       6
       6
       +
       in stdenv.mkDerivation rec {

     

       5
       7
        
         inherit (import ./src.nix fetchurl) name src;

     

       6
       8
        
       

     

       7
       9
        
         propagatedBuildInputs = [

     
···

       13
       15
        
       

     

       14
       16
        
         outputs = [ "out" "dev" ];

     

       15
       17
        
       

     

       16
       16
       -
         nativeBuildInputs = [ pkgconfig intltool gettext perl ]

     

       17
       17
       -
           ++ checkInputs;

     

       18
       18
       +
         nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ]

     

       19
       19
       +
           ++ stdenv.lib.optionals doCheck checkInputs;

     

       20
       20
       +
       

     

       18
       21
        
         buildInputs = [ atk cairo glib pango libxml2 ];

     

       19
       19
       -
         checkInputs = stdenv.lib.optionals doCheck [ xvfb_run dbus ];

     

       20
       22
        
       

     

       21
       23
        
         preBuild = ''

     

       22
       24
        
           substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"

+6 -5

pkgs/desktops/gnome-3/core/gucharmap/default.nix

···

       1
       1
        
       { stdenv, intltool, fetchurl, pkgconfig, gtk3

     

       2
       2
        
       , glib, desktop_file_utils, bash, appdata-tools

     

       3
       3
        
       , wrapGAppsHook, gnome3, itstool, libxml2

     

       4
       4
       -
       , callPackage, unzip }:

     

       4
       4
       +
       , callPackage, unzip, gobjectIntrospection }:

     

       5
       5
        
       

     

       6
       6
        
       # TODO: icons and theme still does not work

     

       7
       7
        
       # use packaged gnome3.adwaita-icon-theme

     
···

       15
       15
        
       

     

       16
       16
        
         preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl";

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip ];

     

       18
       18
       +
         nativeBuildInputs = [

     

       19
       19
       +
           pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools

     

       20
       20
       +
           gnome3.yelp_tools libxml2 desktop_file_utils gobjectIntrospection

     

       21
       21
       +
         ];

     

       19
       22
        
       

     

       20
       20
       -
         buildInputs = [ gtk3 intltool itstool glib appdata-tools

     

       21
       21
       -
                         gnome3.yelp_tools libxml2 desktop_file_utils

     

       22
       22
       -
                         gnome3.gsettings_desktop_schemas ];

     

       23
       23
       +
         buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas ];

     

       23
       24
        
       

     

       24
       25
        
         unicode-data = callPackage ./unicode-data.nix {};

     

       25
       26

+5 -1

pkgs/desktops/gnome-3/core/libpeas/default.nix

···

       8
       8
        
         configureFlags = [ "--enable-python3" ];

     

       9
       9
        
       

     

       10
       10
        
         nativeBuildInputs = [ pkgconfig ];

     

       11
       11
       -
         buildInputs =  [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];

     

       11
       11
       +
         buildInputs =  [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ];

     

       12
       12
       +
         propagatedBuildInputs = [

     

       13
       13
       +
           # Required by libpeas-1.0.pc

     

       14
       14
       +
           gobjectIntrospection

     

       15
       15
       +
         ];

     

       12
       16
        
       

     

       13
       17
        
         meta = with stdenv.lib; {

     

       14
       18
        
           description = "A GObject-based plugins engine";

+6 -2

pkgs/desktops/gnome-3/core/simple-scan/default.nix

···

       1
       1
        
       { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook

     

       2
       2
        
       , cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp

     

       3
       3
       -
       , libxml2, sane-backends, vala, gnome3 }:

     

       3
       3
       +
       , libxml2, sane-backends, vala, gnome3, gobjectIntrospection }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         inherit (import ./src.nix fetchurl) name src;

     

       7
       7
        
       

     

       8
       8
        
         buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb

     

       9
       9
        
                       gtk libwebp packagekit sane-backends vala ];

     

       10
       10
       -
         nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ];

     

       10
       10
       +
         nativeBuildInputs = [

     

       11
       11
       +
           meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2

     

       12
       12
       +
           # For setup hook

     

       13
       13
       +
           gobjectIntrospection

     

       14
       14
       +
         ];

     

       11
       15
        
       

     

       12
       16
        
         postPatch = ''

     

       13
       17
        
           patchShebangs data/meson_compile_gschema.py

+2 -2

pkgs/desktops/gnome-3/misc/gspell/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         inherit (import ./src.nix fetchurl) name src;

     

       5
       5
        
       

     

       6
       6
        
         propagatedBuildInputs = [ enchant ]; # required for pkgconfig

     

       7
       7
        
       

     

       8
       8
       -
         nativeBuildInputs = [ pkgconfig vala ];

     

       8
       8
       +
         nativeBuildInputs = [ pkgconfig vala gobjectIntrospection ];

     

       9
       9
        
         buildInputs = [ glib gtk3 isocodes ];

     

       10
       10
        
       

     

       11
       11
        
         meta = with stdenv.lib; {

+1 -1

pkgs/desktops/gnustep/make/setup-hook.sh

···

       74
       74
        
       	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"

     

       75
       75
        
           fi

     

       76
       76
        
       }

     

       77
       77
       -
       envHooks=(${envHooks[@]} addEnvVars)

     

       77
       77
       +
       addEnvHooks "$targetOffset" addEnvVars

+6 -2

pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:

     

       1
       1
       +
       { stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         majorVersion = "0.4";

     
···

       20
       20
        
           done

     

       21
       21
        
         '';

     

       22
       22
        
       

     

       23
       23
       -
         nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ];

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           perl cmake vala_0_38 pkgconfig makeWrapper

     

       25
       25
       +
           # For setup hook

     

       26
       26
       +
           gobjectIntrospection

     

       27
       27
       +
         ];

     

       24
       28
        
         buildInputs = with gnome3; [

     

       25
       29
        
           glib gtk3 granite libnotify gettext vte_290 libgee

     

       26
       30
        
           gsettings_desktop_schemas defaultIconTheme

+1 -1

pkgs/development/compilers/chicken/setup-hook.sh

···

       4
       4
        
           export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH"

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
       -
       envHooks=(${envHooks[@]} addChickenRepositoryPath)

     

       7
       7
       +
       addEnvHooks "$targetOffset" addChickenRepositoryPath

+14 -54

pkgs/development/compilers/gcc/4.5/default.nix

···

       229
       229
        
         inherit noSysDirs profiledCompiler staticCompiler langJava

     

       230
       230
        
           libcCross crossMingw;

     

       231
       231
        
       

     

       232
       232
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       232
       233
        
         nativeBuildInputs = [ texinfo which gettext ]

     

       233
       234
        
           ++ optional (perl != null) perl;

     

       234
       235
        
       

     

       235
       235
       -
         buildInputs = [ gmp mpfr libmpc libelf ]

     

       236
       236
       -
           ++ (optional (ppl != null) ppl)

     

       236
       236
       +
         # For building runtime libs

     

       237
       237
       +
         depsBuildTarget =

     

       238
       238
       +
           if hostPlatform == buildPlatform then [

     

       239
       239
       +
             targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       240
       240
       +
           ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       241
       241
       +
             stdenv.cc

     

       242
       242
       +
           ];

     

       243
       243
       +
       

     

       244
       244
       +
         buildInputs = [

     

       245
       245
       +
           gmp mpfr libmpc libelf

     

       246
       246
       +
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       247
       247
       +
         ] ++ (optional (ppl != null) ppl)

     

       237
       248
        
           ++ (optional (cloogppl != null) cloogppl)

     

       238
       249
        
           ++ (optional (zlib != null) zlib)

     

       239
       250
        
           ++ (optional langJava boehmgc)

     
···

       245
       256
        
           ;

     

       246
       257
        
       

     

       247
       258
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       248
       248
       -
         configurePlatforms =

     

       249
       249
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       250
       250
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       251
       251
       -
           then []

     

       252
       252
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       259
       259
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       253
       260
        
       

     

       254
       261
        
         configureFlags =

     

       255
       262
        
           # Basic dependencies

     
···

       314
       321
        
       

     

       315
       322
        
         /* For cross-built gcc (build != host == target) */

     

       316
       323
        
         crossAttrs = {

     

       317
       317
       -
           AR_FOR_BUILD = "ar";

     

       318
       318
       -
           AS_FOR_BUILD = "as";

     

       319
       319
       -
           LD_FOR_BUILD = "ld";

     

       320
       320
       -
           NM_FOR_BUILD = "nm";

     

       321
       321
       -
           OBJCOPY_FOR_BUILD = "objcopy";

     

       322
       322
       -
           OBJDUMP_FOR_BUILD = "objdump";

     

       323
       323
       -
           RANLIB_FOR_BUILD = "ranlib";

     

       324
       324
       -
           SIZE_FOR_BUILD = "size";

     

       325
       325
       -
           STRINGS_FOR_BUILD = "strings";

     

       326
       326
       -
           STRIP_FOR_BUILD = "strip";

     

       327
       327
       -
           CC_FOR_BUILD = "gcc";

     

       328
       328
       -
           CXX_FOR_BUILD = "g++";

     

       329
       329
       -
       

     

       330
       330
       -
           AR = "${targetPlatform.config}-ar";

     

       331
       331
       -
           AS = "${targetPlatform.config}-as";

     

       332
       332
       -
           LD = "${targetPlatform.config}-ld";

     

       333
       333
       -
           NM = "${targetPlatform.config}-nm";

     

       334
       334
       -
           OBJCOPY = "${targetPlatform.config}-objcopy";

     

       335
       335
       -
           OBJDUMP = "${targetPlatform.config}-objdump";

     

       336
       336
       -
           RANLIB = "${targetPlatform.config}-ranlib";

     

       337
       337
       -
           SIZE = "${targetPlatform.config}-size";

     

       338
       338
       -
           STRINGS = "${targetPlatform.config}-strings";

     

       339
       339
       -
           STRIP = "${targetPlatform.config}-strip";

     

       340
       340
       -
           CC = "${targetPlatform.config}-gcc";

     

       341
       341
       -
           CXX = "${targetPlatform.config}-g++";

     

       342
       342
       -
       

     

       343
       343
       -
           AR_FOR_TARGET = "${targetPlatform.config}-ar";

     

       344
       344
       -
           AS_FOR_TARGET = "${targetPlatform.config}-as";

     

       345
       345
       -
           LD_FOR_TARGET = "${targetPlatform.config}-ld";

     

       346
       346
       -
           NM_FOR_TARGET = "${targetPlatform.config}-nm";

     

       347
       347
       -
           OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy";

     

       348
       348
       -
           OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump";

     

       349
       349
       -
           RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib";

     

       350
       350
       -
           SIZE_FOR_TARGET = "${targetPlatform.config}-size";

     

       351
       351
       -
           STRINGS_FOR_TARGET = "${targetPlatform.config}-strings";

     

       352
       352
       -
           STRIP_FOR_TARGET = "${targetPlatform.config}-strip";

     

       353
       353
       -
           CC_FOR_TARGET = "${targetPlatform.config}-gcc";

     

       354
       354
       -
           CXX_FOR_TARGET = "${targetPlatform.config}-g++";

     

       355
       355
       -
       

     

       356
       324
        
           dontStrip = true;

     

       357
       325
        
         };

     

       358
       358
       -
       

     

       359
       359
       -
         NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools;

     

       360
       360
       -
         NIX_BUILD_CC = buildPackages.stdenv.cc;

     

       361
       361
       -
       

     

       362
       362
       -
         # Needed for the cross compilation to work

     

       363
       363
       -
         AR = "ar";

     

       364
       364
       -
         LD = "ld";

     

       365
       365
       -
         CC = "gcc";

     

       366
       326
        
       

     

       367
       327
        
         # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the

     

       368
       328
        
         # library headers and binaries, regarless of the language being compiled.

+3 -51

pkgs/development/compilers/gcc/4.8/default.nix

···

       267
       267
        
         inherit noSysDirs staticCompiler langJava

     

       268
       268
        
           libcCross crossMingw;

     

       269
       269
        
       

     

       270
       270
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       270
       271
        
         nativeBuildInputs = [ texinfo which gettext ]

     

       271
       272
        
           ++ (optional (perl != null) perl)

     

       272
       273
        
           ++ (optional javaAwtGtk pkgconfig);

     
···

       297
       298
        
         dontDisableStatic = true;

     

       298
       299
        
       

     

       299
       300
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       300
       300
       -
         configurePlatforms =

     

       301
       301
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       302
       302
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       303
       303
       -
           then []

     

       304
       304
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       301
       301
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       305
       302
        
       

     

       306
       303
        
         configureFlags =

     

       307
       304
        
           # Basic dependencies

     
···

       397
       394
        
       

     

       398
       395
        
         /* For cross-built gcc (build != host == target) */

     

       399
       396
        
         crossAttrs =  {

     

       400
       400
       -
           AR_FOR_BUILD = "ar";

     

       401
       401
       -
           AS_FOR_BUILD = "as";

     

       402
       402
       -
           LD_FOR_BUILD = "ld";

     

       403
       403
       -
           NM_FOR_BUILD = "nm";

     

       404
       404
       -
           OBJCOPY_FOR_BUILD = "objcopy";

     

       405
       405
       -
           OBJDUMP_FOR_BUILD = "objdump";

     

       406
       406
       -
           RANLIB_FOR_BUILD = "ranlib";

     

       407
       407
       -
           SIZE_FOR_BUILD = "size";

     

       408
       408
       -
           STRINGS_FOR_BUILD = "strings";

     

       409
       409
       -
           STRIP_FOR_BUILD = "strip";

     

       410
       410
       -
           CC_FOR_BUILD = "gcc";

     

       411
       411
       -
           CXX_FOR_BUILD = "g++";

     

       412
       412
       -
       

     

       413
       413
       -
           AR = "${targetPlatform.config}-ar";

     

       414
       414
       -
           AS = "${targetPlatform.config}-as";

     

       415
       415
       -
           LD = "${targetPlatform.config}-ld";

     

       416
       416
       -
           NM = "${targetPlatform.config}-nm";

     

       417
       417
       -
           OBJCOPY = "${targetPlatform.config}-objcopy";

     

       418
       418
       -
           OBJDUMP = "${targetPlatform.config}-objdump";

     

       419
       419
       -
           RANLIB = "${targetPlatform.config}-ranlib";

     

       420
       420
       -
           SIZE = "${targetPlatform.config}-size";

     

       421
       421
       -
           STRINGS = "${targetPlatform.config}-strings";

     

       422
       422
       -
           STRIP = "${targetPlatform.config}-strip";

     

       423
       423
       -
           CC = "${targetPlatform.config}-gcc";

     

       424
       424
       -
           CXX = "${targetPlatform.config}-g++";

     

       425
       425
       -
       

     

       426
       426
       -
           AR_FOR_TARGET = "${targetPlatform.config}-ar";

     

       427
       427
       -
           AS_FOR_TARGET = "${targetPlatform.config}-as";

     

       428
       428
       -
           LD_FOR_TARGET = "${targetPlatform.config}-ld";

     

       429
       429
       -
           NM_FOR_TARGET = "${targetPlatform.config}-nm";

     

       430
       430
       -
           OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy";

     

       431
       431
       -
           OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump";

     

       432
       432
       -
           RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib";

     

       433
       433
       -
           SIZE_FOR_TARGET = "${targetPlatform.config}-size";

     

       434
       434
       -
           STRINGS_FOR_TARGET = "${targetPlatform.config}-strings";

     

       435
       435
       -
           STRIP_FOR_TARGET = "${targetPlatform.config}-strip";

     

       436
       436
       -
           CC_FOR_TARGET = "${targetPlatform.config}-gcc";

     

       437
       437
       -
           CXX_FOR_TARGET = "${targetPlatform.config}-g++";

     

       438
       438
       -
       

     

       439
       397
        
           dontStrip = true;

     

       440
       398
        
           buildFlags = "";

     

       441
       399
        
         };

     

       442
       400
        
       

     

       443
       443
       -
         NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools;

     

       444
       444
       -
         NIX_BUILD_CC = buildPackages.stdenv.cc;

     

       445
       445
       -
       

     

       446
       446
       -
         # Needed for the cross compilation to work

     

       447
       447
       -
         AR = "ar";

     

       448
       448
       -
         LD = "ld";

     

       449
       401
        
         # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210

     

       450
       450
       -
         CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";

     

       402
       402
       +
         ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

     

       451
       403
        
       

     

       452
       404
        
         # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the

     

       453
       405
        
         # library headers and binaries, regarless of the language being compiled.

+15 -53

pkgs/development/compilers/gcc/4.9/default.nix

···

       262
       262
        
         inherit noSysDirs staticCompiler langJava

     

       263
       263
        
           libcCross crossMingw;

     

       264
       264
        
       

     

       265
       265
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       265
       266
        
         nativeBuildInputs = [ texinfo which gettext ]

     

       266
       267
        
           ++ (optional (perl != null) perl)

     

       267
       268
        
           ++ (optional javaAwtGtk pkgconfig);

     

       268
       269
        
       

     

       269
       269
       -
         buildInputs = [ gmp mpfr libmpc libelf ]

     

       270
       270
       -
           ++ (optional (cloog != null) cloog)

     

       270
       270
       +
         # For building runtime libs

     

       271
       271
       +
         depsBuildTarget =

     

       272
       272
       +
           if hostPlatform == buildPlatform then [

     

       273
       273
       +
             targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       274
       274
       +
           ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       275
       275
       +
             stdenv.cc

     

       276
       276
       +
           ];

     

       277
       277
       +
       

     

       278
       278
       +
         buildInputs = [

     

       279
       279
       +
           gmp mpfr libmpc libelf

     

       280
       280
       +
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       281
       281
       +
         ] ++ (optional (cloog != null) cloog)

     

       271
       282
        
           ++ (optional (isl != null) isl)

     

       272
       283
        
           ++ (optional (zlib != null) zlib)

     

       273
       284
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     
···

       296
       307
        
         dontDisableStatic = true;

     

       297
       308
        
       

     

       298
       309
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       299
       299
       -
         configurePlatforms =

     

       300
       300
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       301
       301
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       302
       302
       -
           then []

     

       303
       303
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       310
       310
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       304
       311
        
       

     

       305
       312
        
         configureFlags =

     

       306
       313
        
           # Basic dependencies

     
···

       395
       402
        
       

     

       396
       403
        
         /* For cross-built gcc (build != host == target) */

     

       397
       404
        
         crossAttrs = {

     

       398
       398
       -
           AR_FOR_BUILD = "ar";

     

       399
       399
       -
           AS_FOR_BUILD = "as";

     

       400
       400
       -
           LD_FOR_BUILD = "ld";

     

       401
       401
       -
           NM_FOR_BUILD = "nm";

     

       402
       402
       -
           OBJCOPY_FOR_BUILD = "objcopy";

     

       403
       403
       -
           OBJDUMP_FOR_BUILD = "objdump";

     

       404
       404
       -
           RANLIB_FOR_BUILD = "ranlib";

     

       405
       405
       -
           SIZE_FOR_BUILD = "size";

     

       406
       406
       -
           STRINGS_FOR_BUILD = "strings";

     

       407
       407
       -
           STRIP_FOR_BUILD = "strip";

     

       408
       408
       -
           CC_FOR_BUILD = "gcc";

     

       409
       409
       -
           CXX_FOR_BUILD = "g++";

     

       410
       410
       -
       

     

       411
       411
       -
           AR = "${targetPlatform.config}-ar";

     

       412
       412
       -
           AS = "${targetPlatform.config}-as";

     

       413
       413
       -
           LD = "${targetPlatform.config}-ld";

     

       414
       414
       -
           NM = "${targetPlatform.config}-nm";

     

       415
       415
       -
           OBJCOPY = "${targetPlatform.config}-objcopy";

     

       416
       416
       -
           OBJDUMP = "${targetPlatform.config}-objdump";

     

       417
       417
       -
           RANLIB = "${targetPlatform.config}-ranlib";

     

       418
       418
       -
           SIZE = "${targetPlatform.config}-size";

     

       419
       419
       -
           STRINGS = "${targetPlatform.config}-strings";

     

       420
       420
       -
           STRIP = "${targetPlatform.config}-strip";

     

       421
       421
       -
           CC = "${targetPlatform.config}-gcc";

     

       422
       422
       -
           CXX = "${targetPlatform.config}-g++";

     

       423
       423
       -
       

     

       424
       424
       -
           AR_FOR_TARGET = "${targetPlatform.config}-ar";

     

       425
       425
       -
           AS_FOR_TARGET = "${targetPlatform.config}-as";

     

       426
       426
       -
           LD_FOR_TARGET = "${targetPlatform.config}-ld";

     

       427
       427
       -
           NM_FOR_TARGET = "${targetPlatform.config}-nm";

     

       428
       428
       -
           OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy";

     

       429
       429
       -
           OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump";

     

       430
       430
       -
           RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib";

     

       431
       431
       -
           SIZE_FOR_TARGET = "${targetPlatform.config}-size";

     

       432
       432
       -
           STRINGS_FOR_TARGET = "${targetPlatform.config}-strings";

     

       433
       433
       -
           STRIP_FOR_TARGET = "${targetPlatform.config}-strip";

     

       434
       434
       -
           CC_FOR_TARGET = "${targetPlatform.config}-gcc";

     

       435
       435
       -
           CXX_FOR_TARGET = "${targetPlatform.config}-g++";

     

       436
       436
       -
       

     

       437
       405
        
           dontStrip = true;

     

       438
       406
        
           buildFlags = "";

     

       439
       407
        
         };

     

       440
       408
        
       

     

       441
       441
       -
         NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools;

     

       442
       442
       -
         NIX_BUILD_CC = buildPackages.stdenv.cc;

     

       443
       443
       -
       

     

       444
       444
       -
         # Needed for the cross compilation to work

     

       445
       445
       -
         AR = "ar";

     

       446
       446
       -
         LD = "ld";

     

       447
       409
        
         # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210

     

       448
       448
       -
         CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";

     

       410
       410
       +
         ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

     

       449
       411
        
       

     

       450
       412
        
         # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the

     

       451
       413
        
         # library headers and binaries, regarless of the language being compiled.

+15 -57

pkgs/development/compilers/gcc/5/default.nix

···

       49
       49
        
       # Make sure we get GNU sed.

     

       50
       50
        
       assert hostPlatform.isDarwin -> gnused != null;

     

       51
       51
        
       

     

       52
       52
       -
       # Need c++filt on darwin

     

       53
       53
       -
       assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;

     

       54
       54
       -
       

     

       55
       52
        
       # The go frontend is written in c++

     

       56
       53
        
       assert langGo -> langCC;

     

       57
       54
        
       

     
···

       277
       274
        
         inherit noSysDirs staticCompiler langJava

     

       278
       275
        
           libcCross crossMingw;

     

       279
       276
        
       

     

       277
       277
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       280
       278
        
         nativeBuildInputs = [ texinfo which gettext ]

     

       281
       279
        
           ++ (optional (perl != null) perl)

     

       282
       280
        
           ++ (optional javaAwtGtk pkgconfig);

     

       283
       281
        
       

     

       284
       284
       -
         buildInputs = [ gmp mpfr libmpc libelf ]

     

       285
       285
       -
           ++ (optional (isl != null) isl)

     

       282
       282
       +
         # For building runtime libs

     

       283
       283
       +
         depsBuildTarget =

     

       284
       284
       +
           if hostPlatform == buildPlatform then [

     

       285
       285
       +
             targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       286
       286
       +
           ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       287
       287
       +
             stdenv.cc

     

       288
       288
       +
           ];

     

       289
       289
       +
       

     

       290
       290
       +
         buildInputs = [

     

       291
       291
       +
           gmp mpfr libmpc libelf

     

       292
       292
       +
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       293
       293
       +
         ] ++ (optional (isl != null) isl)

     

       286
       294
        
           ++ (optional (zlib != null) zlib)

     

       287
       295
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       288
       296
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       289
       297
        
           ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

     

       290
       290
       -
           ++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc])

     

       291
       298
        
           ++ (optionals langAda [gnatboot])

     

       292
       299
        
           ++ (optionals langVhdl [gnat])

     

       293
       300
        
       

     
···

       309
       316
        
         dontDisableStatic = true;

     

       310
       317
        
       

     

       311
       318
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       312
       312
       -
         configurePlatforms =

     

       313
       313
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       314
       314
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       315
       315
       -
           then []

     

       316
       316
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       319
       319
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       317
       320
        
       

     

       318
       321
        
         configureFlags =

     

       319
       322
        
           # Basic dependencies

     
···

       404
       407
        
       

     

       405
       408
        
         /* For cross-built gcc (build != host == target) */

     

       406
       409
        
         crossAttrs = {

     

       407
       407
       -
           AR_FOR_BUILD = "ar";

     

       408
       408
       -
           AS_FOR_BUILD = "as";

     

       409
       409
       -
           LD_FOR_BUILD = "ld";

     

       410
       410
       -
           NM_FOR_BUILD = "nm";

     

       411
       411
       -
           OBJCOPY_FOR_BUILD = "objcopy";

     

       412
       412
       -
           OBJDUMP_FOR_BUILD = "objdump";

     

       413
       413
       -
           RANLIB_FOR_BUILD = "ranlib";

     

       414
       414
       -
           SIZE_FOR_BUILD = "size";

     

       415
       415
       -
           STRINGS_FOR_BUILD = "strings";

     

       416
       416
       -
           STRIP_FOR_BUILD = "strip";

     

       417
       417
       -
           CC_FOR_BUILD = "gcc";

     

       418
       418
       -
           CXX_FOR_BUILD = "g++";

     

       419
       419
       -
       

     

       420
       420
       -
           AR = "${targetPlatform.config}-ar";

     

       421
       421
       -
           AS = "${targetPlatform.config}-as";

     

       422
       422
       -
           LD = "${targetPlatform.config}-ld";

     

       423
       423
       -
           NM = "${targetPlatform.config}-nm";

     

       424
       424
       -
           OBJCOPY = "${targetPlatform.config}-objcopy";

     

       425
       425
       -
           OBJDUMP = "${targetPlatform.config}-objdump";

     

       426
       426
       -
           RANLIB = "${targetPlatform.config}-ranlib";

     

       427
       427
       -
           SIZE = "${targetPlatform.config}-size";

     

       428
       428
       -
           STRINGS = "${targetPlatform.config}-strings";

     

       429
       429
       -
           STRIP = "${targetPlatform.config}-strip";

     

       430
       430
       -
           CC = "${targetPlatform.config}-gcc";

     

       431
       431
       -
           CXX = "${targetPlatform.config}-g++";

     

       432
       432
       -
       

     

       433
       433
       -
           AR_FOR_TARGET = "${targetPlatform.config}-ar";

     

       434
       434
       -
           AS_FOR_TARGET = "${targetPlatform.config}-as";

     

       435
       435
       -
           LD_FOR_TARGET = "${targetPlatform.config}-ld";

     

       436
       436
       -
           NM_FOR_TARGET = "${targetPlatform.config}-nm";

     

       437
       437
       -
           OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy";

     

       438
       438
       -
           OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump";

     

       439
       439
       -
           RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib";

     

       440
       440
       -
           SIZE_FOR_TARGET = "${targetPlatform.config}-size";

     

       441
       441
       -
           STRINGS_FOR_TARGET = "${targetPlatform.config}-strings";

     

       442
       442
       -
           STRIP_FOR_TARGET = "${targetPlatform.config}-strip";

     

       443
       443
       -
           CC_FOR_TARGET = "${targetPlatform.config}-gcc";

     

       444
       444
       -
           CXX_FOR_TARGET = "${targetPlatform.config}-g++";

     

       445
       445
       -
       

     

       446
       410
        
           dontStrip = true;

     

       447
       411
        
           buildFlags = "";

     

       448
       412
        
         };

     

       449
       413
        
       

     

       450
       450
       -
         NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools;

     

       451
       451
       -
         NIX_BUILD_CC = buildPackages.stdenv.cc;

     

       452
       452
       -
       

     

       453
       453
       -
         # Needed for the cross compilation to work

     

       454
       454
       -
         AR = "ar";

     

       455
       455
       -
         LD = "ld";

     

       456
       414
        
         # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210

     

       457
       457
       -
         CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";

     

       415
       415
       +
         ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

     

       458
       416
        
       

     

       459
       417
        
         # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the

     

       460
       418
        
         # library headers and binaries, regarless of the language being compiled.

+15 -56

pkgs/development/compilers/gcc/6/default.nix

···

       49
       49
        
       # Make sure we get GNU sed.

     

       50
       50
        
       assert hostPlatform.isDarwin -> gnused != null;

     

       51
       51
        
       

     

       52
       52
       -
       # Need c++filt on darwin

     

       53
       53
       -
       assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;

     

       54
       54
       -
       

     

       55
       52
        
       # The go frontend is written in c++

     

       56
       53
        
       assert langGo -> langCC;

     

       57
       54
        
       

     
···

       276
       273
        
         inherit noSysDirs staticCompiler langJava

     

       277
       274
        
           libcCross crossMingw;

     

       278
       275
        
       

     

       276
       276
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       279
       277
        
         nativeBuildInputs = [ texinfo which gettext ]

     

       280
       278
        
           ++ (optional (perl != null) perl)

     

       281
       279
        
           ++ (optional javaAwtGtk pkgconfig);

     

       282
       280
        
       

     

       283
       283
       -
         buildInputs = [ gmp mpfr libmpc libelf ]

     

       284
       284
       -
           ++ (optional (isl != null) isl)

     

       281
       281
       +
         # For building runtime libs

     

       282
       282
       +
         depsBuildTarget =

     

       283
       283
       +
           if hostPlatform == buildPlatform then [

     

       284
       284
       +
             targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       285
       285
       +
           ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       286
       286
       +
             stdenv.cc

     

       287
       287
       +
           ];

     

       288
       288
       +
       

     

       289
       289
       +
         buildInputs = [

     

       290
       290
       +
           gmp mpfr libmpc libelf

     

       291
       291
       +
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       292
       292
       +
         ] ++ (optional (isl != null) isl)

     

       285
       293
        
           ++ (optional (zlib != null) zlib)

     

       286
       294
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       287
       295
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     
···

       311
       319
        
         dontDisableStatic = true;

     

       312
       320
        
       

     

       313
       321
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       314
       314
       -
         configurePlatforms =

     

       315
       315
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       316
       316
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       317
       317
       -
           then []

     

       318
       318
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       322
       322
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       319
       323
        
       

     

       320
       324
        
         configureFlags =

     

       321
       325
        
           # Basic dependencies

     
···

       405
       409
        
       

     

       406
       410
        
         /* For cross-built gcc (build != host == target) */

     

       407
       411
        
         crossAttrs = {

     

       408
       408
       -
           AR_FOR_BUILD = "ar";

     

       409
       409
       -
           AS_FOR_BUILD = "as";

     

       410
       410
       -
           LD_FOR_BUILD = "ld";

     

       411
       411
       -
           NM_FOR_BUILD = "nm";

     

       412
       412
       -
           OBJCOPY_FOR_BUILD = "objcopy";

     

       413
       413
       -
           OBJDUMP_FOR_BUILD = "objdump";

     

       414
       414
       -
           RANLIB_FOR_BUILD = "ranlib";

     

       415
       415
       -
           SIZE_FOR_BUILD = "size";

     

       416
       416
       -
           STRINGS_FOR_BUILD = "strings";

     

       417
       417
       -
           STRIP_FOR_BUILD = "strip";

     

       418
       418
       -
           CC_FOR_BUILD = "gcc";

     

       419
       419
       -
           CXX_FOR_BUILD = "g++";

     

       420
       420
       -
       

     

       421
       421
       -
           AR = "${targetPlatform.config}-ar";

     

       422
       422
       -
           AS = "${targetPlatform.config}-as";

     

       423
       423
       -
           LD = "${targetPlatform.config}-ld";

     

       424
       424
       -
           NM = "${targetPlatform.config}-nm";

     

       425
       425
       -
           OBJCOPY = "${targetPlatform.config}-objcopy";

     

       426
       426
       -
           OBJDUMP = "${targetPlatform.config}-objdump";

     

       427
       427
       -
           RANLIB = "${targetPlatform.config}-ranlib";

     

       428
       428
       -
           SIZE = "${targetPlatform.config}-size";

     

       429
       429
       -
           STRINGS = "${targetPlatform.config}-strings";

     

       430
       430
       -
           STRIP = "${targetPlatform.config}-strip";

     

       431
       431
       -
           CC = "${targetPlatform.config}-gcc";

     

       432
       432
       -
           CXX = "${targetPlatform.config}-g++";

     

       433
       433
       -
       

     

       434
       434
       -
           AR_FOR_TARGET = "${targetPlatform.config}-ar";

     

       435
       435
       -
           AS_FOR_TARGET = "${targetPlatform.config}-as";

     

       436
       436
       -
           LD_FOR_TARGET = "${targetPlatform.config}-ld";

     

       437
       437
       -
           NM_FOR_TARGET = "${targetPlatform.config}-nm";

     

       438
       438
       -
           OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy";

     

       439
       439
       -
           OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump";

     

       440
       440
       -
           RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib";

     

       441
       441
       -
           SIZE_FOR_TARGET = "${targetPlatform.config}-size";

     

       442
       442
       -
           STRINGS_FOR_TARGET = "${targetPlatform.config}-strings";

     

       443
       443
       -
           STRIP_FOR_TARGET = "${targetPlatform.config}-strip";

     

       444
       444
       -
           CC_FOR_TARGET = "${targetPlatform.config}-gcc";

     

       445
       445
       -
           CXX_FOR_TARGET = "${targetPlatform.config}-g++";

     

       446
       446
       -
       

     

       447
       412
        
           dontStrip = true;

     

       448
       413
        
           buildFlags = "";

     

       449
       414
        
         };

     

       450
       415
        
       

     

       451
       451
       -
         NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools;

     

       452
       452
       -
         NIX_BUILD_CC = buildPackages.stdenv.cc;

     

       453
       453
       -
       

     

       454
       454
       -
         # Needed for the cross compilation to work

     

       455
       455
       -
         AR = "ar";

     

       456
       456
       -
         LD = "ld";

     

       457
       416
        
         # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210

     

       458
       458
       -
         CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";

     

       417
       417
       +
         ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

     

       459
       418
        
       

     

       460
       419
        
         # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the

     

       461
       420
        
         # library headers and binaries, regarless of the language being compiled.

+15 -56

pkgs/development/compilers/gcc/7/default.nix

···

       50
       50
        
       # Make sure we get GNU sed.

     

       51
       51
        
       assert hostPlatform.isDarwin -> gnused != null;

     

       52
       52
        
       

     

       53
       53
       -
       # Need c++filt on darwin

     

       54
       54
       -
       assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;

     

       55
       55
       -
       

     

       56
       53
        
       # The go frontend is written in c++

     

       57
       54
        
       assert langGo -> langCC;

     

       58
       55
        
       

     
···

       273
       270
        
         inherit noSysDirs staticCompiler langJava

     

       274
       271
        
           libcCross crossMingw;

     

       275
       272
        
       

     

       273
       273
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       276
       274
        
         nativeBuildInputs = [ texinfo which gettext ]

     

       277
       275
        
           ++ (optional (perl != null) perl)

     

       278
       276
        
           ++ (optional javaAwtGtk pkgconfig);

     

       279
       277
        
       

     

       280
       280
       -
         buildInputs = [ gmp mpfr libmpc libelf flex ]

     

       281
       281
       -
           ++ (optional (isl != null) isl)

     

       278
       278
       +
         # For building runtime libs

     

       279
       279
       +
         depsBuildTarget =

     

       280
       280
       +
           if hostPlatform == buildPlatform then [

     

       281
       281
       +
             targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       282
       282
       +
           ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       283
       283
       +
             stdenv.cc

     

       284
       284
       +
           ];

     

       285
       285
       +
       

     

       286
       286
       +
         buildInputs = [

     

       287
       287
       +
           gmp mpfr libmpc libelf flex

     

       288
       288
       +
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       289
       289
       +
         ] ++ (optional (isl != null) isl)

     

       282
       290
        
           ++ (optional (zlib != null) zlib)

     

       283
       291
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       284
       292
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     
···

       304
       312
        
         dontDisableStatic = true;

     

       305
       313
        
       

     

       306
       314
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       307
       307
       -
         configurePlatforms =

     

       308
       308
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       309
       309
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       310
       310
       -
           then []

     

       311
       311
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       315
       315
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       312
       316
        
       

     

       313
       317
        
         configureFlags =

     

       314
       318
        
           # Basic dependencies

     
···

       399
       403
        
       

     

       400
       404
        
         /* For cross-built gcc (build != host == target) */

     

       401
       405
        
         crossAttrs = {

     

       402
       402
       -
           AR_FOR_BUILD = "ar";

     

       403
       403
       -
           AS_FOR_BUILD = "as";

     

       404
       404
       -
           LD_FOR_BUILD = "ld";

     

       405
       405
       -
           NM_FOR_BUILD = "nm";

     

       406
       406
       -
           OBJCOPY_FOR_BUILD = "objcopy";

     

       407
       407
       -
           OBJDUMP_FOR_BUILD = "objdump";

     

       408
       408
       -
           RANLIB_FOR_BUILD = "ranlib";

     

       409
       409
       -
           SIZE_FOR_BUILD = "size";

     

       410
       410
       -
           STRINGS_FOR_BUILD = "strings";

     

       411
       411
       -
           STRIP_FOR_BUILD = "strip";

     

       412
       412
       -
           CC_FOR_BUILD = "gcc";

     

       413
       413
       -
           CXX_FOR_BUILD = "g++";

     

       414
       414
       -
       

     

       415
       415
       -
           AR = "${targetPlatform.config}-ar";

     

       416
       416
       -
           AS = "${targetPlatform.config}-as";

     

       417
       417
       -
           LD = "${targetPlatform.config}-ld";

     

       418
       418
       -
           NM = "${targetPlatform.config}-nm";

     

       419
       419
       -
           OBJCOPY = "${targetPlatform.config}-objcopy";

     

       420
       420
       -
           OBJDUMP = "${targetPlatform.config}-objdump";

     

       421
       421
       -
           RANLIB = "${targetPlatform.config}-ranlib";

     

       422
       422
       -
           SIZE = "${targetPlatform.config}-size";

     

       423
       423
       -
           STRINGS = "${targetPlatform.config}-strings";

     

       424
       424
       -
           STRIP = "${targetPlatform.config}-strip";

     

       425
       425
       -
           CC = "${targetPlatform.config}-gcc";

     

       426
       426
       -
           CXX = "${targetPlatform.config}-g++";

     

       427
       427
       -
       

     

       428
       428
       -
           AR_FOR_TARGET = "${targetPlatform.config}-ar";

     

       429
       429
       -
           AS_FOR_TARGET = "${targetPlatform.config}-as";

     

       430
       430
       -
           LD_FOR_TARGET = "${targetPlatform.config}-ld";

     

       431
       431
       -
           NM_FOR_TARGET = "${targetPlatform.config}-nm";

     

       432
       432
       -
           OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy";

     

       433
       433
       -
           OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump";

     

       434
       434
       -
           RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib";

     

       435
       435
       -
           SIZE_FOR_TARGET = "${targetPlatform.config}-size";

     

       436
       436
       -
           STRINGS_FOR_TARGET = "${targetPlatform.config}-strings";

     

       437
       437
       -
           STRIP_FOR_TARGET = "${targetPlatform.config}-strip";

     

       438
       438
       -
           CC_FOR_TARGET = "${targetPlatform.config}-gcc";

     

       439
       439
       -
           CXX_FOR_TARGET = "${targetPlatform.config}-g++";

     

       440
       440
       -
       

     

       441
       406
        
           dontStrip = true;

     

       442
       407
        
           buildFlags = "";

     

       443
       408
        
         };

     

       444
       409
        
       

     

       445
       445
       -
         NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools;

     

       446
       446
       -
         NIX_BUILD_CC = buildPackages.stdenv.cc;

     

       447
       447
       -
       

     

       448
       448
       -
         # Needed for the cross compilation to work

     

       449
       449
       -
         AR = "ar";

     

       450
       450
       -
         LD = "ld";

     

       451
       410
        
         # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210

     

       452
       452
       -
         CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";

     

       411
       411
       +
         ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

     

       453
       412
        
       

     

       454
       413
        
         # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the

     

       455
       414
        
         # library headers and binaries, regarless of the language being compiled.

+15 -56

pkgs/development/compilers/gcc/snapshot/default.nix

···

       50
       50
        
       # Make sure we get GNU sed.

     

       51
       51
        
       assert hostPlatform.isDarwin -> gnused != null;

     

       52
       52
        
       

     

       53
       53
       -
       # Need c++filt on darwin

     

       54
       54
       -
       assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;

     

       55
       55
       -
       

     

       56
       53
        
       # The go frontend is written in c++

     

       57
       54
        
       assert langGo -> langCC;

     

       58
       55
        
       

     
···

       260
       257
        
         inherit noSysDirs staticCompiler langJava

     

       261
       258
        
           libcCross crossMingw;

     

       262
       259
        
       

     

       260
       260
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       263
       261
        
         nativeBuildInputs = [ texinfo which gettext ]

     

       264
       262
        
           ++ (optional (perl != null) perl)

     

       265
       263
        
           ++ (optional javaAwtGtk pkgconfig);

     

       266
       264
        
       

     

       267
       267
       -
         buildInputs = [ gmp mpfr libmpc libelf flex ]

     

       268
       268
       -
           ++ (optional (isl != null) isl)

     

       265
       265
       +
         # For building runtime libs

     

       266
       266
       +
         depsBuildTarget =

     

       267
       267
       +
           if hostPlatform == buildPlatform then [

     

       268
       268
       +
             targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       269
       269
       +
           ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       270
       270
       +
             stdenv.cc

     

       271
       271
       +
           ];

     

       272
       272
       +
       

     

       273
       273
       +
         buildInputs = [

     

       274
       274
       +
           gmp mpfr libmpc libelf flex

     

       275
       275
       +
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       276
       276
       +
         ] ++ (optional (isl != null) isl)

     

       269
       277
        
           ++ (optional (zlib != null) zlib)

     

       270
       278
        
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       271
       279
        
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     
···

       291
       299
        
         dontDisableStatic = true;

     

       292
       300
        
       

     

       293
       301
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       294
       294
       -
         configurePlatforms =

     

       295
       295
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       296
       296
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       297
       297
       -
           then []

     

       298
       298
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       302
       302
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       299
       303
        
       

     

       300
       304
        
         configureFlags =

     

       301
       305
        
           # Basic dependencies

     
···

       386
       390
        
       

     

       387
       391
        
         /* For cross-built gcc (build != host == target) */

     

       388
       392
        
         crossAttrs = {

     

       389
       389
       -
           AR_FOR_BUILD = "ar";

     

       390
       390
       -
           AS_FOR_BUILD = "as";

     

       391
       391
       -
           LD_FOR_BUILD = "ld";

     

       392
       392
       -
           NM_FOR_BUILD = "nm";

     

       393
       393
       -
           OBJCOPY_FOR_BUILD = "objcopy";

     

       394
       394
       -
           OBJDUMP_FOR_BUILD = "objdump";

     

       395
       395
       -
           RANLIB_FOR_BUILD = "ranlib";

     

       396
       396
       -
           SIZE_FOR_BUILD = "size";

     

       397
       397
       -
           STRINGS_FOR_BUILD = "strings";

     

       398
       398
       -
           STRIP_FOR_BUILD = "strip";

     

       399
       399
       -
           CC_FOR_BUILD = "gcc";

     

       400
       400
       -
           CXX_FOR_BUILD = "g++";

     

       401
       401
       -
       

     

       402
       402
       -
           AR = "${targetPlatform.config}-ar";

     

       403
       403
       -
           AS = "${targetPlatform.config}-as";

     

       404
       404
       -
           LD = "${targetPlatform.config}-ld";

     

       405
       405
       -
           NM = "${targetPlatform.config}-nm";

     

       406
       406
       -
           OBJCOPY = "${targetPlatform.config}-objcopy";

     

       407
       407
       -
           OBJDUMP = "${targetPlatform.config}-objdump";

     

       408
       408
       -
           RANLIB = "${targetPlatform.config}-ranlib";

     

       409
       409
       -
           SIZE = "${targetPlatform.config}-size";

     

       410
       410
       -
           STRINGS = "${targetPlatform.config}-strings";

     

       411
       411
       -
           STRIP = "${targetPlatform.config}-strip";

     

       412
       412
       -
           CC = "${targetPlatform.config}-gcc";

     

       413
       413
       -
           CXX = "${targetPlatform.config}-g++";

     

       414
       414
       -
       

     

       415
       415
       -
           AR_FOR_TARGET = "${targetPlatform.config}-ar";

     

       416
       416
       -
           AS_FOR_TARGET = "${targetPlatform.config}-as";

     

       417
       417
       -
           LD_FOR_TARGET = "${targetPlatform.config}-ld";

     

       418
       418
       -
           NM_FOR_TARGET = "${targetPlatform.config}-nm";

     

       419
       419
       -
           OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy";

     

       420
       420
       -
           OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump";

     

       421
       421
       -
           RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib";

     

       422
       422
       -
           SIZE_FOR_TARGET = "${targetPlatform.config}-size";

     

       423
       423
       -
           STRINGS_FOR_TARGET = "${targetPlatform.config}-strings";

     

       424
       424
       -
           STRIP_FOR_TARGET = "${targetPlatform.config}-strip";

     

       425
       425
       -
           CC_FOR_TARGET = "${targetPlatform.config}-gcc";

     

       426
       426
       -
           CXX_FOR_TARGET = "${targetPlatform.config}-g++";

     

       427
       427
       -
       

     

       428
       393
        
           dontStrip = true;

     

       429
       394
        
           buildFlags = "";

     

       430
       395
        
         };

     

       431
       396
        
       

     

       432
       432
       -
         NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools;

     

       433
       433
       -
         NIX_BUILD_CC = buildPackages.stdenv.cc;

     

       434
       434
       -
       

     

       435
       435
       -
         # Needed for the cross compilation to work

     

       436
       436
       -
         AR = "ar";

     

       437
       437
       -
         LD = "ld";

     

       438
       397
        
         # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210

     

       439
       439
       -
         CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";

     

       398
       398
       +
         ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

     

       440
       399
        
       

     

       441
       400
        
         # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the

     

       442
       401
        
         # library headers and binaries, regarless of the language being compiled.

+4 -2

pkgs/development/compilers/gerbil/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchgit, gambit,

     

       2
       2
        
         coreutils, rsync, bash,

     

       3
       3
       -
         openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }:

     

       3
       3
       +
         openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb }:

     

       4
       4
        
       

     

       5
       5
        
       # TODO: distinct packages for gerbil-release and gerbil-devel

     

       6
       6
        
       

     
···

       17
       17
        
         buildInputs = [

     

       18
       18
        
           gambit

     

       19
       19
        
           coreutils rsync bash

     

       20
       20
       -
           openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb

     

       20
       20
       +
           openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb

     

       21
       21
        
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];

     

       22
       24
        
       

     

       23
       25
        
         postPatch = ''

     

       24
       26
        
           echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm

+1 -1

pkgs/development/compilers/go/setup-hook.sh

···

       2
       2
        
           addToSearchPath GOPATH $1/share/go

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks=(${envHooks[@]} addToGoPath)

     

       5
       5
       +
       addEnvHooks "$targetOffset" addToGoPath

+1 -1

pkgs/development/compilers/haxe/setup-hook.sh

···

       4
       4
        
         fi

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
       -
       envHooks+=(addHaxeLibPath)

     

       7
       7
       +
       addEnvHooks "$targetOffset" addHaxeLibPath

+2 -2

pkgs/development/compilers/hhvm/default.nix

···

       2
       2
        
       , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php

     

       3
       3
        
       , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5

     

       4
       4
        
       , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng

     

       5
       5
       -
       , libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit

     

       5
       5
       +
       , libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit

     

       6
       6
        
       , libvpx, imagemagick, fribidi, gperf, which, ocamlPackages

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs =

     

       22
       22
       -
           [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl

     

       22
       22
       +
           [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl

     

       23
       23
        
             libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap

     

       24
       24
        
             oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline

     

       25
       25
        
             libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5

-4

pkgs/development/compilers/llvm/3.7/default.nix

···

       44
       44
        
           stdenv = stdenv.override (drv: {

     

       45
       45
        
             allowedRequisites = null;

     

       46
       46
        
             cc = self.clang;

     

       47
       47
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       48
       48
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       49
       47
        
           });

     

       50
       48
        
       

     

       51
       49
        
           libcxxStdenv = stdenv.override (drv: {

     

       52
       50
        
             allowedRequisites = null;

     

       53
       51
        
             cc = self.libcxxClang;

     

       54
       54
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       55
       55
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       56
       52
        
           });

     

       57
       53
        
       

     

       58
       54
        
           lldb = callPackage ./lldb.nix {};

-4

pkgs/development/compilers/llvm/3.8/default.nix

···

       41
       41
        
           stdenv = stdenv.override (drv: {

     

       42
       42
        
             allowedRequisites = null;

     

       43
       43
        
             cc = self.clang;

     

       44
       44
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       45
       45
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       46
       44
        
           });

     

       47
       45
        
       

     

       48
       46
        
           libcxxStdenv = stdenv.override (drv: {

     

       49
       47
        
             allowedRequisites = null;

     

       50
       48
        
             cc = self.libcxxClang;

     

       51
       51
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       52
       52
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       53
       49
        
           });

     

       54
       50
        
       

     

       55
       51
        
           lldb = callPackage ./lldb.nix {};

-4

pkgs/development/compilers/llvm/3.9/default.nix

···

       41
       41
        
           stdenv = stdenv.override (drv: {

     

       42
       42
        
             allowedRequisites = null;

     

       43
       43
        
             cc = self.clang;

     

       44
       44
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       45
       45
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       46
       44
        
           });

     

       47
       45
        
       

     

       48
       46
        
           libcxxStdenv = stdenv.override (drv: {

     

       49
       47
        
             allowedRequisites = null;

     

       50
       48
        
             cc = self.libcxxClang;

     

       51
       51
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       52
       52
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       53
       49
        
           });

     

       54
       50
        
       

     

       55
       51
        
           lldb = callPackage ./lldb.nix {};

-4

pkgs/development/compilers/llvm/4/default.nix

···

       56
       56
        
           stdenv = stdenv.override (drv: {

     

       57
       57
        
             allowedRequisites = null;

     

       58
       58
        
             cc = self.clang;

     

       59
       59
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       60
       60
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       61
       59
        
           });

     

       62
       60
        
       

     

       63
       61
        
           libcxxStdenv = stdenv.override (drv: {

     

       64
       62
        
             allowedRequisites = null;

     

       65
       63
        
             cc = self.libcxxClang;

     

       66
       66
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       67
       67
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       68
       64
        
           });

     

       69
       65
        
       

     

       70
       66
        
           lld = callPackage ./lld.nix {};

+1 -1

pkgs/development/compilers/llvm/5/clang/default.nix

···

       9
       9
        
           name = "clang-${version}";

     

       10
       10
        
       

     

       11
       11
        
           unpackPhase = ''

     

       12
       12
       -
             unpackFile ${fetch "cfe" "0w09s8fn3lkn6i04nj0cisgp821r815fk5b5fjn97xrd371277q1"}

     

       12
       12
       +
             unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"}

     

       13
       13
        
             mv cfe-${version}* clang

     

       14
       14
        
             sourceRoot=$PWD/clang

     

       15
       15
        
             unpackFile ${clang-tools-extra_src}

+3 -7

pkgs/development/compilers/llvm/5/default.nix

···

       6
       6
        
       let

     

       7
       7
        
         callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });

     

       8
       8
        
       

     

       9
       9
       -
         release_version = "5.0.0";

     

       9
       9
       +
         release_version = "5.0.1";

     

       10
       10
        
         version = release_version; # differentiating these is important for rc's

     

       11
       11
        
       

     

       12
       12
        
         fetch = name: sha256: fetchurl {

     
···

       14
       14
        
           inherit sha256;

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         compiler-rt_src = fetch "compiler-rt" "1cy0y389zxn7mk8vffqvfirk9bbcbc8ziwc1nf1a8d118rk55bfm";

     

       18
       18
       -
         clang-tools-extra_src = fetch "clang-tools-extra" "1ikkv6k8cfgpjqlm24iqz52i5nyafzsc4dyikzzyb9n4b6wpil47";

     

       17
       17
       +
         compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf";

     

       18
       18
       +
         clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs";

     

       19
       19
        
       

     

       20
       20
        
         # Add man output without introducing extra dependencies.

     

       21
       21
        
         overrideManOutput = drv:

     
···

       56
       56
        
           stdenv = stdenv.override (drv: {

     

       57
       57
        
             allowedRequisites = null;

     

       58
       58
        
             cc = self.clang;

     

       59
       59
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       60
       60
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       61
       59
        
           });

     

       62
       60
        
       

     

       63
       61
        
           libcxxStdenv = stdenv.override (drv: {

     

       64
       62
        
             allowedRequisites = null;

     

       65
       63
        
             cc = self.libcxxClang;

     

       66
       66
       -
             # Don't include the libc++ and libc++abi from the original stdenv.

     

       67
       67
       -
             extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF;

     

       68
       64
        
           });

     

       69
       65
        
       

     

       70
       66
        
           lld = callPackage ./lld.nix {};

+1 -1

pkgs/development/compilers/llvm/5/libc++/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libc++-${version}";

     

       5
       5
        
       

     

       6
       6
       -
         src = fetch "libcxx" "1cf953msb0vwgjjrapw06950dnsdb2ps305czkn0vvr1k8g9irga";

     

       6
       6
       +
         src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs";

     

       7
       7
        
       

     

       8
       8
        
         postUnpack = ''

     

       9
       9
        
           unpackFile ${libcxxabi.src}

+1 -1

pkgs/development/compilers/llvm/5/libc++abi.nix

···

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "libc++abi-${version}";

     

       5
       5
        
       

     

       6
       6
       -
         src = fetch "libcxxabi" "04c9dfmrr8diih73x0wq99dk9xb99mg0bvsnbhx5q912xg3ihs8p";

     

       6
       6
       +
         src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as";

     

       7
       7
        
       

     

       8
       8
        
         nativeBuildInputs = [ cmake ];

     

       9
       9
        
         buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;

+1 -1

pkgs/development/compilers/llvm/5/lld.nix

···

       10
       10
        
       stdenv.mkDerivation {

     

       11
       11
        
         name = "lld-${version}";

     

       12
       12
        
       

     

       13
       13
       -
         src = fetch "lld" "15rqsmfw0jlsri7hszbs8l0j7v1030cy9xvvdb245397llh7k6ir";

     

       13
       13
       +
         src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym";

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ cmake ];

     

       16
       16
        
         buildInputs = [ llvm ];

+1 -1

pkgs/development/compilers/llvm/5/lldb.nix

···

       17
       17
        
       stdenv.mkDerivation {

     

       18
       18
        
         name = "lldb-${version}";

     

       19
       19
        
       

     

       20
       20
       -
         src = fetch "lldb" "0zcbav39srf6awv9znvzr7nqdrj704i8da3wdgc8362y20rcm860";

     

       20
       20
       +
         src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp";

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

     

       23
       23
        
           # Fix up various paths that assume llvm and clang are installed in the same place

+1 -1

pkgs/development/compilers/llvm/5/llvm.nix

···

       22
       22
        
       }:

     

       23
       23
        
       

     

       24
       24
        
       let

     

       25
       25
       -
         src = fetch "llvm" "1nin64vz21hyng6jr19knxipvggaqlkl2l9jpd5czbc4c2pcnpg3";

     

       25
       25
       +
         src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz";

     

       26
       26
        
       

     

       27
       27
        
         # Used when creating a version-suffixed symlink of libLLVM.dylib

     

       28
       28
        
         shortVersion = with stdenv.lib;

+1 -1

pkgs/development/compilers/llvm/5/openmp.nix

···

       10
       10
        
       stdenv.mkDerivation {

     

       11
       11
        
         name = "openmp-${version}";

     

       12
       12
        
       

     

       13
       13
       -
         src = fetch "openmp" "1igplg89bl6k6r9q88hnpcznq3g9lb79w7bix025lwp00ldhivy0";

     

       13
       13
       +
         src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd";

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ cmake perl ];

     

       16
       16
        
         buildInputs = [ llvm ];

+2 -2

pkgs/development/compilers/neko/default.nix

···

       1
       1
        
       { stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig

     

       2
       2
       -
       , git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2, libpthreadstubs

     

       2
       2
       +
       , git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       14
       14
        
         nativeBuildInputs = [ cmake pkgconfig git ];

     

       15
       15
        
         buildInputs =

     

       16
       16
        
           [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil

     

       17
       17
       -
             mariadb.client mbedtls openssl libpthreadstubs ]

     

       17
       17
       +
             mysql.connector-c mbedtls openssl libpthreadstubs ]

     

       18
       18
        
             ++ stdenv.lib.optional stdenv.isLinux gtk2

     

       19
       19
        
             ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security

     

       20
       20
        
                                                       pkgs.darwin.apple_sdk.frameworks.Carbon];

+1 -1

pkgs/development/compilers/sbcl/default.nix

···

       91
       91
        
       

     

       92
       92
        
         # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`.

     

       93
       93
        
         setupHook = writeText "setupHook.sh" ''

     

       94
       94
       -
           envHooks+=(_setSbclHome)

     

       94
       94
       +
           addEnvHooks "$targetOffset" _setSbclHome

     

       95
       95
        
           _setSbclHome() {

     

       96
       96
        
             export SBCL_HOME='@out@/lib/sbcl/'

     

       97
       97
        
           }

+3 -3

pkgs/development/compilers/urweb/default.nix

···

       11
       11
        
           sha256 = "17qh9mcmlhbv6r52yij8l9ik7j7x6x7c09lf6pznnbdh4sf8p5wb";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ openssl mlton mysql.client postgresql sqlite ];

     

       14
       14
       +
         buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite ];

     

       15
       15
        
       

     

       16
       16
        
         prePatch = ''

     

       17
       17
        
           sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure

     
···

       21
       21
        
       

     

       22
       22
        
         preConfigure = ''

     

       23
       23
        
           export PGHEADER="${postgresql}/include/libpq-fe.h";

     

       24
       24
       -
           export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h";

     

       24
       24
       +
           export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h";

     

       25
       25
        
           export SQHEADER="${sqlite.dev}/include/sqlite3.h";

     

       26
       26
        
       

     

       27
       27
        
           export CC="${gcc}/bin/gcc";

     

       28
       28
        
           export CCARGS="-I$out/include \

     

       29
       29
        
                          -L${openssl.out}/lib \

     

       30
       30
       -
                          -L${lib.getLib mysql.client}/lib \

     

       30
       30
       +
                          -L${mysql.connector-c}/lib \

     

       31
       31
        
                          -L${postgresql.lib}/lib \

     

       32
       32
        
                          -L${sqlite.out}/lib";

     

       33
       33
        
         '';

+18 -6

pkgs/development/compilers/vala/default.nix

···

       29
       29
        
       

     

       30
       30
        
       in rec {

     

       31
       31
        
       

     

       32
       32
       +
         vala_0_23 = generic {

     

       33
       33
       +
           major   = "0.23";

     

       34
       34
       +
           minor   = "3";

     

       35
       35
       +
           sha256  = "101xjbc818g4849n9a80c2aai13zakj7mpnd7470xnkvz5jwqq96";

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       32
       38
        
         vala_0_26 = generic {

     

       33
       39
        
           major   = "0.26";

     

       34
       40
        
           minor   = "2";

     
···

       37
       43
        
       

     

       38
       44
        
         vala_0_28 = generic {

     

       39
       45
        
           major   = "0.28";

     

       40
       40
       -
           minor   = "0";

     

       41
       41
       -
           sha256  = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd";

     

       46
       46
       +
           minor   = "1";

     

       47
       47
       +
           sha256  = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw";

     

       42
       48
        
         };

     

       43
       49
        
       

     

       44
       50
        
         vala_0_32 = generic {

     
···

       49
       55
        
       

     

       50
       56
        
         vala_0_34 = generic {

     

       51
       57
        
           major   = "0.34";

     

       52
       52
       -
           minor   = "1";

     

       53
       53
       -
           sha256  = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m";

     

       58
       58
       +
           minor   = "13";

     

       59
       59
       +
           sha256  = "0ahbnhgwhhjkndmbr1d039ws0g2bb324c60fk6wgx7py5wvmgcd2";

     

       60
       60
       +
         };

     

       61
       61
       +
       

     

       62
       62
       +
         vala_0_36 = generic {

     

       63
       63
       +
           major   = "0.36";

     

       64
       64
       +
           minor   = "8";

     

       65
       65
       +
           sha256  = "1nz5a8kcb22ss9idb7k1higwpvghd617xwf40fi0a9ggws614lfz";

     

       54
       66
        
         };

     

       55
       67
        
       

     

       56
       68
        
         vala_0_38 = generic {

     

       57
       69
        
           major   = "0.38";

     

       58
       58
       -
           minor   = "1";

     

       59
       59
       -
           sha256  = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h";

     

       70
       70
       +
           minor   = "4";

     

       71
       71
       +
           sha256  = "1sg5gaq3jhgr9vzh2ypiw475167k150wmyglymr7wwqppmikmcrc";

     

       60
       72
        
           extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ];

     

       61
       73
        
           extraBuildInputs = [ graphviz ];

     

       62
       74
        
         };

+1 -1

pkgs/development/haskell-modules/configuration-common.nix

···

       70
       70
        
       

     

       71
       71
        
         # Use the default version of mysql to build this package (which is actually mariadb).

     

       72
       72
        
         # test phase requires networking

     

       73
       73
       -
         mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; });

     

       73
       73
       +
         mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });

     

       74
       74
        
       

     

       75
       75
        
         # check requires mysql server

     

       76
       76
        
         mysql-simple = dontCheck super.mysql-simple;

+1 -1

pkgs/development/haskell-modules/configuration-nix.nix

···

       53
       53
        
       

     

       54
       54
        
         # Use the default version of mysql to build this package (which is actually mariadb).

     

       55
       55
        
         # test phase requires networking

     

       56
       56
       -
         mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; });

     

       56
       56
       +
         mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });

     

       57
       57
        
       

     

       58
       58
        
         # CUDA needs help finding the SDK headers and libraries.

     

       59
       59
        
         cuda = overrideCabal super.cuda (drv: {

+2 -2

pkgs/development/haskell-modules/generic-builder.nix

···

       222
       222
        
           setupCompileFlags="${concatStringsSep " " setupCompileFlags}"

     

       223
       223
        
           configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"

     

       224
       224
        
       

     

       225
       225
       -
           # nativePkgs defined in stdenv/setup.hs

     

       226
       226
       -
           for p in "''${nativePkgs[@]}"; do

     

       225
       225
       +
           # host.*Pkgs defined in stdenv/setup.hs

     

       226
       226
       +
           for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do

     

       227
       227
        
             if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then

     

       228
       228
        
               cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/

     

       229
       229
        
               continue

+2 -1

pkgs/development/idris-modules/build-idris-package.nix

···

       18
       18
        
             fi

     

       19
       19
        
           }

     

       20
       20
        
       

     

       21
       21
       -
           envHooks+=(addIdrisLibs)

     

       21
       21
       +
           # All run-time deps

     

       22
       22
       +
           addEnvHooks 0 addIdrisLibs

     

       22
       23
        
         '';

     

       23
       24
        
       

     

       24
       25
        
         buildPhase = ''

+1 -1

pkgs/development/idris-modules/with-packages.nix

···

       14
       14
        
             fi

     

       15
       15
        
           }

     

       16
       16
        
       

     

       17
       17
       -
           envHooks+=(installIdrisLib)

     

       17
       17
       +
           envHostTargetHooks+=(installIdrisLib)

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
        
         unpackPhase = ''

+1 -1

pkgs/development/interpreters/elixir/setup-hook.sh

···

       2
       2
        
           addToSearchPath ERL_LIBS $1/lib/elixir/lib

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addErlLibPath)

     

       5
       5
       +
       addEnvHooks "$hostOffset" addErlLibPath

+1 -1

pkgs/development/interpreters/erlang/setup-hook.sh

···

       2
       2
        
           addToSearchPath ERL_LIBS $1/lib/erlang/lib

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addErlangLibPath)

     

       5
       5
       +
       addEnvHooks "$hostOffset" addErlangLibPath

+1 -1

pkgs/development/interpreters/guile/setup-hook-2.0.sh

···

       10
       10
        
           fi

     

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
       -
       envHooks+=(addGuileLibPath)

     

       13
       13
       +
       addEnvHooks "$hostOffset" addGuileLibPath

+1 -1

pkgs/development/interpreters/guile/setup-hook-2.2.sh

···

       10
       10
        
           fi

     

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
       -
       envHooks+=(addGuileLibPath)

     

       13
       13
       +
       addEnvHooks "$hostOffset" addGuileLibPath

+1 -1

pkgs/development/interpreters/guile/setup-hook.sh

···

       5
       5
        
           fi

     

       6
       6
        
       }

     

       7
       7
        
       

     

       8
       8
       -
       envHooks+=(addGuileLibPath)

     

       8
       8
       +
       addEnvHooks "$hostOffset" addGuileLibPath

+1 -1

pkgs/development/interpreters/jruby/default.nix

···

       36
       36
        
                addToSearchPath GEM_PATH \$1/${passthru.gemPath}

     

       37
       37
        
              }

     

       38
       38
        
       

     

       39
       39
       -
              envHooks+=(addGemPath)

     

       39
       39
       +
              addEnvHooks "$hostOffset" addGemPath

     

       40
       40
        
            EOF

     

       41
       41
        
         '';

     

       42
       42

+1 -1

pkgs/development/interpreters/perl/setup-hook.sh

···

       2
       2
        
           addToSearchPath PERL5LIB $1/lib/perl5/site_perl

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addPerlLibPath)

     

       5
       5
       +
       addEnvHooks "$hostOffset" addPerlLibPath

+3 -4

pkgs/development/interpreters/php/default.nix

···

       12
       12
        
           { version, sha256 }:

     

       13
       13
        
       

     

       14
       14
        
           let php7 = lib.versionAtLeast version "7.0";

     

       15
       15
       -
               mysqlHeaders = mysql.lib.dev or mysql;

     

       16
       15
        
               mysqlndSupport = config.php.mysqlnd or false;

     

       17
       17
       -
               mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders;

     

       16
       16
       +
               mysqlBuildInputs = lib.optional (!mysqlndSupport) mysql.connector-c;

     

       18
       17
        
       

     

       19
       18
        
           in composableDerivation.composableDerivation {} (fixed: {

     

       20
       19
        
       

     
···

       121
       120
        
               };

     

       122
       121
        
       

     

       123
       122
        
               mysqli = {

     

       124
       124
       -
                 configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"];

     

       123
       123
       +
                 configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"];

     

       125
       124
        
                 buildInputs = mysqlBuildInputs;

     

       126
       125
        
               };

     

       127
       126
        
       

     
···

       132
       131
        
               };

     

       133
       132
        
       

     

       134
       133
        
               pdo_mysql = {

     

       135
       135
       -
                 configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"];

     

       134
       134
       +
                 configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"];

     

       136
       135
        
                 buildInputs = mysqlBuildInputs;

     

       137
       136
        
               };

     

       138
       137

+11 -6

pkgs/development/interpreters/python/mk-python-derivation.nix

···

       13
       13
        
       

     

       14
       14
        
       { name ? "${attrs.pname}-${attrs.version}"

     

       15
       15
        
       

     

       16
       16
       -
       # Dependencies for building the package

     

       16
       16
       +
       # Build-time dependencies for the package

     

       17
       17
       +
       , nativeBuildInputs ? []

     

       18
       18
       +
       

     

       19
       19
       +
       # Run-time dependencies for the package

     

       17
       20
        
       , buildInputs ? []

     

       18
       21
        
       

     

       19
       22
        
       # Dependencies needed for running the checkPhase.

     
···

       66
       69
        
       

     

       67
       70
        
         name = namePrefix + name;

     

       68
       71
        
       

     

       69
       69
       -
         buildInputs = ([ wrapPython (ensureNewerSourcesHook { year = "1980"; }) ]

     

       70
       70
       -
           ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)

     

       72
       72
       +
         nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ]

     

       73
       73
       +
           ++ nativeBuildInputs;

     

       74
       74
       +
       

     

       75
       75
       +
         buildInputs = [ wrapPython ]

     

       76
       76
       +
           ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip

     

       71
       77
        
           ++ lib.optionals doCheck checkInputs

     

       72
       72
       -
           ++ lib.optional catchConflicts setuptools # If we nog longer propagate setuptools

     

       78
       78
       +
           ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools

     

       73
       79
        
           ++ buildInputs

     

       74
       74
       -
           ++ pythonPath

     

       75
       75
       -
         );

     

       80
       80
       +
           ++ pythonPath;

     

       76
       81
        
       

     

       77
       82
        
         # Propagate python and setuptools. We should stop propagating setuptools.

     

       78
       83
        
         propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];

+4 -1

pkgs/development/interpreters/python/setup-hook.sh

···

       12
       12
        
           echo $result

     

       13
       13
        
       }

     

       14
       14
        
       

     

       15
       15
       -
       envHooks+=(addPythonPath)

     

       15
       15
       +
       addEnvHooks "$hostOffset" addPythonPath

     

       16
       16
        
       

     

       17
       17
        
       # Determinism: The interpreter is patched to write null timestamps when compiling python files.

     

       18
       18
        
       # This way python doesn't try to update them when we freeze timestamps in nix store.

     

       19
       19
        
       export DETERMINISTIC_BUILD=1;

     

       20
       20
        
       # Determinism: We fix the hashes of str, bytes and datetime objects.

     

       21
       21
        
       export PYTHONHASHSEED=0;

     

       22
       22
       +
       # Determinism. Whenever Python is included, it should not check user site-packages.

     

       23
       23
       +
       # This option is only relevant when the sandbox is disabled.

     

       24
       24
       +
       export PYTHONNOUSERSITE=1;

+1 -1

pkgs/development/interpreters/ruby/default.nix

···

       150
       150
        
                   addToSearchPath GEM_PATH \$1/${passthru.gemPath}

     

       151
       151
        
                 }

     

       152
       152
        
       

     

       153
       153
       -
                 envHooks+=(addGemPath)

     

       153
       153
       +
                 addEnvHooks "$hostOffset" addGemPath

     

       154
       154
        
                 EOF

     

       155
       155
        
               '' + opString useRailsExpress ''

     

       156
       156
        
                 rbConfig=$(find $out/lib/ruby -name rbconfig.rb)

+1 -5

pkgs/development/libraries/SDL/setup-hook.sh

···

       4
       4
        
         fi

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
       -
       if test -n "$crossConfig"; then

     

       8
       8
       -
         crossEnvHooks+=(addSDLPath)

     

       9
       9
       -
       else

     

       10
       10
       -
         envHooks+=(addSDLPath)

     

       11
       11
       -
       fi

     

       7
       7
       +
       addEnvHooks "$hostOffset" addSDLPath

+1 -5

pkgs/development/libraries/SDL2/setup-hook.sh

···

       4
       4
        
         fi

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
       -
       if test -n "$crossConfig"; then

     

       8
       8
       -
         crossEnvHooks+=(addSDL2Path)

     

       9
       9
       -
       else

     

       10
       10
       -
         envHooks+=(addSDL2Path)

     

       11
       11
       -
       fi

     

       7
       7
       +
       addEnvHooks "$hostOffset" addSDL2Path

+1 -3

pkgs/development/libraries/atk/default.nix

···

       18
       18
        
       

     

       19
       19
        
         buildInputs = libintlOrEmpty;

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ pkgconfig perl ];

     

       21
       21
       +
         nativeBuildInputs = [ pkgconfig perl gobjectIntrospection ];

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

     

       24
       24
        
           # Required by atk.pc

     

       25
       25
        
           glib

     

       26
       26
       -
           # TODO: Why propagate?

     

       27
       27
       -
           gobjectIntrospection

     

       28
       26
        
         ];

     

       29
       27
        
       

     

       30
       28
        
         doCheck = true;

+29 -29

pkgs/development/libraries/boost/1.59.nix

···

       8
       8
        
           sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         patches = if stdenv.isCygwin then [

     

       12
       12
       -
             ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch

     

       13
       13
       -
             ./cygwin-fedora-boost-1.50.0-pool.patch

     

       14
       14
       -
             ./cygwin-fedora-boost-1.57.0-mpl-print.patch

     

       15
       15
       -
             ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch

     

       16
       16
       -
             ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch

     

       17
       17
       -
             ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch

     

       18
       18
       -
             ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch

     

       19
       19
       -
             ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch

     

       20
       20
       -
             ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch

     

       21
       21
       -
             ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch

     

       22
       22
       -
             ./cygwin-fedora-boost-1.57.0-move-is_class.patch

     

       23
       23
       -
             ./cygwin-1.40.0-cstdint-cygwin.patch

     

       24
       24
       -
             ./cygwin-1.57.0-asio-cygwin.patch

     

       25
       25
       -
             ./cygwin-1.55.0-asio-MSG_EOR.patch

     

       26
       26
       -
             ./cygwin-1.57.0-config-cygwin.patch

     

       27
       27
       -
             ./cygwin-1.57.0-context-cygwin.patch

     

       28
       28
       -
             ./cygwin-1.57.0-filesystem-cygwin.patch

     

       29
       29
       -
             ./cygwin-1.55.0-interlocked-cygwin.patch

     

       30
       30
       -
             ./cygwin-1.40.0-iostreams-cygwin.patch

     

       31
       31
       -
             ./cygwin-1.57.0-locale-cygwin.patch

     

       32
       32
       -
             ./cygwin-1.57.0-log-cygwin.patch

     

       33
       33
       -
             ./cygwin-1.40.0-python-cygwin.patch

     

       34
       34
       -
             ./cygwin-1.40.0-regex-cygwin.patch

     

       35
       35
       -
             ./cygwin-1.57.0-smart_ptr-cygwin.patch

     

       36
       36
       -
             ./cygwin-1.57.0-system-cygwin.patch

     

       37
       37
       -
             ./cygwin-1.45.0-jam-cygwin.patch

     

       38
       38
       -
             ./cygwin-1.50.0-jam-pep3149.patch

     

       39
       39
       -
           ] else null;

     

       11
       11
       +
         patches = stdenv.lib.optionals stdenv.isCygwin [

     

       12
       12
       +
           ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch

     

       13
       13
       +
           ./cygwin-fedora-boost-1.50.0-pool.patch

     

       14
       14
       +
           ./cygwin-fedora-boost-1.57.0-mpl-print.patch

     

       15
       15
       +
           ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch

     

       16
       16
       +
           ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch

     

       17
       17
       +
           ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch

     

       18
       18
       +
           ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch

     

       19
       19
       +
           ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch

     

       20
       20
       +
           ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch

     

       21
       21
       +
           ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch

     

       22
       22
       +
           ./cygwin-fedora-boost-1.57.0-move-is_class.patch

     

       23
       23
       +
           ./cygwin-1.40.0-cstdint-cygwin.patch

     

       24
       24
       +
           ./cygwin-1.57.0-asio-cygwin.patch

     

       25
       25
       +
           ./cygwin-1.55.0-asio-MSG_EOR.patch

     

       26
       26
       +
           ./cygwin-1.57.0-config-cygwin.patch

     

       27
       27
       +
           ./cygwin-1.57.0-context-cygwin.patch

     

       28
       28
       +
           ./cygwin-1.57.0-filesystem-cygwin.patch

     

       29
       29
       +
           ./cygwin-1.55.0-interlocked-cygwin.patch

     

       30
       30
       +
           ./cygwin-1.40.0-iostreams-cygwin.patch

     

       31
       31
       +
           ./cygwin-1.57.0-locale-cygwin.patch

     

       32
       32
       +
           ./cygwin-1.57.0-log-cygwin.patch

     

       33
       33
       +
           ./cygwin-1.40.0-python-cygwin.patch

     

       34
       34
       +
           ./cygwin-1.40.0-regex-cygwin.patch

     

       35
       35
       +
           ./cygwin-1.57.0-smart_ptr-cygwin.patch

     

       36
       36
       +
           ./cygwin-1.57.0-system-cygwin.patch

     

       37
       37
       +
           ./cygwin-1.45.0-jam-cygwin.patch

     

       38
       38
       +
           ./cygwin-1.50.0-jam-pep3149.patch

     

       39
       39
       +
         ];

     

       40
       40
        
       })

+1 -1

pkgs/development/libraries/boost/1.65.nix

···

       9
       9
        
           sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         enableNumpy = true;

     

       12
       12
       +
         enableNumpy = args.enableNumpy or true;

     

       13
       13
        
       

     

       14
       14
        
       })

+14

pkgs/development/libraries/boost/1.66.nix

···

       1
       1
       +
       { stdenv, callPackage, fetchurl, ... } @ args:

     

       2
       2
       +
       

     

       3
       3
       +
       callPackage ./generic.nix (args // rec {

     

       4
       4
       +
         version = "1.66_0";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "mirror://sourceforge/boost/boost_1_66_0.tar.bz2";

     

       8
       8
       +
           # SHA256 from http://www.boost.org/users/history/version_1_66_0.html

     

       9
       9
       +
           sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         enableNumpy = args.enableNumpy or true;

     

       13
       13
       +
       

     

       14
       14
       +
       })

+54 -96

pkgs/development/libraries/boost/generic.nix

···

       1
       1
        
       { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv

     

       2
       2
       -
       , buildPlatform, hostPlatform

     

       3
       3
       -
       , toolset ? if stdenv.cc.isClang then "clang" else null

     

       2
       2
       +
       , which

     

       3
       3
       +
       , buildPackages, buildPlatform, hostPlatform

     

       4
       4
       +
       , toolset ? /**/ if stdenv.cc.isClang                                then "clang"

     

       5
       5
       +
                   else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross"

     

       6
       6
       +
                   else null

     

       4
       7
        
       , enableRelease ? true

     

       5
       8
        
       , enableDebug ? false

     

       6
       9
        
       , enableSingleThreaded ? false

     

       7
       10
        
       , enableMultiThreaded ? true

     

       8
       11
        
       , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now

     

       9
       12
        
       , enableStatic ? !enableShared

     

       10
       10
       -
       , enablePIC ? false

     

       11
       11
       -
       , enableExceptions ? false

     

       12
       13
        
       , enablePython ? hostPlatform == buildPlatform

     

       13
       14
        
       , enableNumpy ? false

     

       14
       15
        
       , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))

     

       15
       15
       -
       , patches ? null

     

       16
       16
       +
       , patches ? []

     

       16
       17
        
       , mpi ? null

     

       17
       18
        
       

     

       18
       19
        
       # Attributes inherit from specific versions

     
···

       21
       22
        
       }:

     

       22
       23
        
       

     

       23
       24
        
       # We must build at least one type of libraries

     

       24
       24
       -
       assert !enableShared -> enableStatic;

     

       25
       25
       +
       assert enableShared || enableStatic;

     

       25
       26
        
       

     

       27
       27
       +
       # Python isn't supported when cross-compiling

     

       26
       28
        
       assert enablePython -> hostPlatform == buildPlatform;

     

       27
       29
        
       assert enableNumpy -> enablePython;

     

       28
       30
        
       

     
···

       46
       48
        
         # To avoid library name collisions

     

       47
       49
        
         layout = if taggedLayout then "tagged" else "system";

     

       48
       50
        
       

     

       49
       49
       -
         cflags = if enablePIC && enableExceptions then

     

       50
       50
       -
                    "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"

     

       51
       51
       -
                  else if enablePIC then

     

       52
       52
       -
                    "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"

     

       53
       53
       -
                  else if enableExceptions then

     

       54
       54
       -
                    "cflags=-fexceptions"

     

       55
       55
       -
                  else

     

       56
       56
       -
                    "";

     

       57
       57
       -
       

     

       58
       58
       -
         withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}";

     

       59
       59
       -
       

     

       60
       60
       -
         genericB2Flags = [

     

       51
       51
       +
         b2Args = concatStringsSep " " ([

     

       61
       52
        
           "--includedir=$dev/include"

     

       62
       53
        
           "--libdir=$out/lib"

     

       63
       54
        
           "-j$NIX_BUILD_CORES"

     

       64
       55
        
           "--layout=${layout}"

     

       65
       56
        
           "variant=${variant}"

     

       66
       57
        
           "threading=${threading}"

     

       67
       67
       -
         ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [

     

       58
       58
       +
           "runtime-link=${runtime-link}"

     

       68
       59
        
           "link=${link}"

     

       69
       69
       -
           "${cflags}"

     

       70
       70
       -
         ] ++ optional (variant == "release") "debug-symbols=off"

     

       71
       71
       -
           ++ optional (!enablePython) "--without-python";

     

       72
       72
       -
       

     

       73
       73
       -
         nativeB2Flags = [

     

       74
       60
        
           "-sEXPAT_INCLUDE=${expat.dev}/include"

     

       75
       61
        
           "-sEXPAT_LIBPATH=${expat.out}/lib"

     

       76
       76
       -
         ] ++ optional (toolset != null) "toolset=${toolset}"

     

       77
       77
       -
           ++ optional (mpi != null) "--user-config=user-config.jam";

     

       78
       78
       -
         nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);

     

       79
       79
       -
       

     

       80
       80
       -
         crossB2Flags = [

     

       81
       81
       -
           "-sEXPAT_INCLUDE=${expat.crossDrv}/include"

     

       82
       82
       -
           "-sEXPAT_LIBPATH=${expat.crossDrv}/lib"

     

       83
       83
       -
           "--user-config=user-config.jam"

     

       84
       84
       -
           "toolset=gcc-cross"

     

       85
       85
       -
         ] ++ optionals (hostPlatform.libc == "msvcrt") [

     

       62
       62
       +
         ] ++ optional (variant == "release") "debug-symbols=off"

     

       63
       63
       +
           ++ optional (toolset != null) "toolset=${toolset}"

     

       64
       64
       +
           ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam"

     

       65
       65
       +
           ++ optionals (hostPlatform.libc == "msvcrt") [

     

       86
       66
        
           "target-os=windows"

     

       87
       67
        
           "threadapi=win32"

     

       88
       68
        
           "binary-format=pe"

     

       89
       69
        
           "address-model=${toString hostPlatform.parsed.cpu.bits}"

     

       90
       70
        
           "architecture=x86"

     

       91
       91
       -
         ];

     

       92
       92
       -
         crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags);

     

       93
       93
       -
       

     

       94
       94
       -
         builder = b2Args: ''

     

       95
       95
       -
           ./b2 ${b2Args}

     

       96
       96
       -
         '';

     

       97
       97
       -
       

     

       98
       98
       -
         installer = b2Args: ''

     

       99
       99
       -
           # boostbook is needed by some applications

     

       100
       100
       -
           mkdir -p $dev/share/boostbook

     

       101
       101
       -
           cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/

     

       102
       102
       -
       

     

       103
       103
       -
           # Let boost install everything else

     

       104
       104
       -
           ./b2 ${b2Args} install

     

       105
       105
       -
         '';

     

       106
       106
       -
       

     

       107
       107
       -
         commonConfigureFlags = [

     

       108
       108
       -
           "--includedir=$(dev)/include"

     

       109
       109
       -
           "--libdir=$(out)/lib"

     

       110
       110
       -
         ];

     

       111
       111
       -
       

     

       112
       112
       -
         fixup = ''

     

       113
       113
       -
           # Make boost header paths relative so that they are not runtime dependencies

     

       114
       114
       -
           (

     

       115
       115
       -
             cd "$dev"

     

       116
       116
       -
             find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \

     

       117
       117
       -
               -exec sed '1i#line 1 "{}"' -i '{}' \;

     

       118
       118
       -
           )

     

       119
       119
       -
         '' + optionalString (hostPlatform.libc == "msvcrt") ''

     

       120
       120
       -
           ${stdenv.cc.targetPrefix}ranlib "$out/lib/"*.a

     

       121
       121
       -
         '';

     

       71
       71
       +
         ]);

     

       122
       72
        
       

     

       123
       73
        
       in

     

       124
       74
        
       

     

       125
       75
        
       stdenv.mkDerivation {

     

       126
       76
        
         name = "boost-${version}";

     

       127
       77
        
       

     

       128
       128
       -
         inherit src patches version;

     

       78
       78
       +
         inherit src;

     

       79
       79
       +
       

     

       80
       80
       +
         patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0";

     

       81
       81
       +
         patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl {

     

       82
       82
       +
           url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"

     

       83
       83
       +
               + "boost-mingw.patch";

     

       84
       84
       +
           sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";

     

       85
       85
       +
         });

     

       129
       86
        
       

     

       130
       87
        
         meta = {

     

       131
       88
        
           homepage = http://boost.org/;

     
···

       142
       99
        
                 --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)";

     

       143
       100
        
           fi;

     

       144
       101
        
         '' + optionalString (mpi != null) ''

     

       145
       145
       -
           cat << EOF > user-config.jam

     

       102
       102
       +
           cat << EOF >> user-config.jam

     

       146
       103
        
           using mpi : ${mpi}/bin/mpiCC ;

     

       147
       104
        
           EOF

     

       105
       105
       +
         '' + optionalString (hostPlatform != buildPlatform) ''

     

       106
       106
       +
           cat << EOF >> user-config.jam

     

       107
       107
       +
           using gcc : cross : ${stdenv.cc.targetPrefix}c++ ;

     

       108
       108
       +
           EOF

     

       148
       109
        
         '';

     

       149
       110
        
       

     

       150
       111
        
         NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin

     
···

       152
       113
        
       

     

       153
       114
        
         enableParallelBuilding = true;

     

       154
       115
        
       

     

       116
       116
       +
         nativeBuildInputs = [ which buildPackages.stdenv.cc ];

     

       155
       117
        
         buildInputs = [ expat zlib bzip2 libiconv ]

     

       156
       118
        
           ++ optional (hostPlatform == buildPlatform) icu

     

       157
       119
        
           ++ optional stdenv.isDarwin fixDarwinDylibNames

     
···

       159
       121
        
           ++ optional enableNumpy python.pkgs.numpy;

     

       160
       122
        
       

     

       161
       123
        
         configureScript = "./bootstrap.sh";

     

       162
       162
       -
         configureFlags = commonConfigureFlags

     

       163
       163
       -
           ++ [ "--with-python=${python.interpreter}" ]

     

       164
       164
       -
           ++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}"

     

       165
       165
       -
           ++ optional (toolset != null) "--with-toolset=${toolset}";

     

       124
       124
       +
         configurePlatforms = [];

     

       125
       125
       +
         configureFlags = [

     

       126
       126
       +
           "--includedir=$(dev)/include"

     

       127
       127
       +
           "--libdir=$(out)/lib"

     

       128
       128
       +
           (if enablePython then "--with-python=${python.interpreter}" else "--without-python")

     

       129
       129
       +
           (if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else  "--without-icu")

     

       130
       130
       +
         ] ++ optional (toolset != null) "--with-toolset=${toolset}";

     

       131
       131
       +
       

     

       132
       132
       +
         buildPhase = ''

     

       133
       133
       +
           ./b2 ${b2Args}

     

       134
       134
       +
         '';

     

       166
       135
        
       

     

       167
       167
       -
         buildPhase = builder nativeB2Args;

     

       136
       136
       +
         installPhase = ''

     

       137
       137
       +
           # boostbook is needed by some applications

     

       138
       138
       +
           mkdir -p $dev/share/boostbook

     

       139
       139
       +
           cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/

     

       168
       140
        
       

     

       169
       169
       -
         installPhase = installer nativeB2Args;

     

       141
       141
       +
           # Let boost install everything else

     

       142
       142
       +
           ./b2 ${b2Args} install

     

       143
       143
       +
         '';

     

       170
       144
        
       

     

       171
       171
       -
         postFixup = fixup;

     

       145
       145
       +
         postFixup = ''

     

       146
       146
       +
           # Make boost header paths relative so that they are not runtime dependencies

     

       147
       147
       +
           find "$dev/include" \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \

     

       148
       148
       +
             -exec sed '1i#line 1 "{}"' -i '{}' \;

     

       149
       149
       +
         '' + optionalString (hostPlatform.libc == "msvcrt") ''

     

       150
       150
       +
           $RANLIB "$out/lib/"*.a

     

       151
       151
       +
         '';

     

       172
       152
        
       

     

       173
       153
        
         outputs = [ "out" "dev" ];

     

       174
       154
        
         setOutputFlags = false;

     

       175
       175
       -
       

     

       176
       176
       -
         crossAttrs = rec {

     

       177
       177
       -
           # We want to substitute the contents of configureFlags, removing thus the

     

       178
       178
       -
           # usual --build and --host added on cross building.

     

       179
       179
       -
           preConfigure = ''

     

       180
       180
       -
             export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}"

     

       181
       181
       -
             cat << EOF > user-config.jam

     

       182
       182
       -
             using gcc : cross : $crossConfig-g++ ;

     

       183
       183
       -
             EOF

     

       184
       184
       -
           '';

     

       185
       185
       -
           buildPhase = builder crossB2Args;

     

       186
       186
       -
           installPhase = installer crossB2Args;

     

       187
       187
       -
           postFixup = fixup;

     

       188
       188
       -
         } // optionalAttrs (hostPlatform.libc == "msvcrt") {

     

       189
       189
       -
           patches = fetchurl {

     

       190
       190
       -
             url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/"

     

       191
       191
       -
                 + "boost-mingw.patch";

     

       192
       192
       -
             sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";

     

       193
       193
       -
           };

     

       194
       194
       -
       

     

       195
       195
       -
           patchFlags = "-p0";

     

       196
       196
       -
         };

     

       197
       155
        
       }

+3 -3

pkgs/development/libraries/cppdb/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, sqlite, libmysql, postgresql, unixODBC }:

     

       1
       1
       +
       { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "cppdb";

     
···

       11
       11
        
       

     

       12
       12
        
         enableParallelBuilding = true;

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ cmake sqlite libmysql postgresql unixODBC ];

     

       14
       14
       +
         buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ];

     

       15
       15
        
       

     

       16
       16
        
         cmakeFlags = [ "--no-warn-unused-cli" ];

     

       17
       17
       +
         NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];

     

       17
       18
        
       

     

       18
       19
        
         meta = with stdenv.lib; {

     

       19
       20
        
           homepage = http://cppcms.com/sql/cppdb/;

     
···

       23
       24
        
           maintainers = [ maintainers.juliendehos ];

     

       24
       25
        
         };

     

       25
       26
        
       }

     

       26
       26
       -

+1 -1

pkgs/development/libraries/gdal/default.nix

···

       29
       29
        
           "--with-poppler=${poppler.dev}" # optional

     

       30
       30
        
           "--with-libz=${zlib.dev}"       # optional

     

       31
       31
        
           "--with-pg=${postgresql}/bin/pg_config"

     

       32
       32
       -
           "--with-mysql=${mysql.lib.dev}/bin/mysql_config"

     

       32
       32
       +
           "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"

     

       33
       33
        
           "--with-geotiff=${libgeotiff}"

     

       34
       34
        
           "--with-sqlite3=${sqlite.dev}"

     

       35
       35
        
           "--with-spatialite=${libspatialite}"

+2 -2

pkgs/development/libraries/gdal/gdal-1_11.nix

···

       1
       1
        
       { stdenv, fetchurl, unzip, libjpeg, libtiff, zlib

     

       2
       2
       -
       , postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl

     

       2
       2
       +
       , postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl

     

       3
       3
        
       , libpng }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       32
       32
        
           "--with-libz=${zlib.dev}"       # optional

     

       33
       33
        
       

     

       34
       34
        
           "--with-pg=${postgresql}/bin/pg_config"

     

       35
       35
       -
           "--with-mysql=${mysql.lib.dev}/bin/mysql_config"

     

       35
       35
       +
           "--with-mysql=${mysql57.connector-c}/bin/mysql_config"

     

       36
       36
        
           "--with-geotiff=${libgeotiff}"

     

       37
       37
        
           "--with-python"               # optional

     

       38
       38
        
           "--with-static-proj4=${proj}" # optional

+1 -1

pkgs/development/libraries/gdk-pixbuf/setup-hook.sh

···

       14
       14
        
       

     

       15
       15
        
       }

     

       16
       16
        
       

     

       17
       17
       -
       envHooks+=(findGdkPixbufLoaders)

     

       17
       17
       +
       addEnvHooks "$hostOffset" findGdkPixbufLoaders

+1 -1

pkgs/development/libraries/glib/setup-hook.sh

···

       5
       5
        
               addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"*

     

       6
       6
        
           fi

     

       7
       7
        
       }

     

       8
       8
       -
       envHooks+=(make_glib_find_gsettings_schemas)

     

       8
       8
       +
       addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas

     

       9
       9
        
       

     

       10
       10
        
       # Install gschemas, if any, in a package-specific directory

     

       11
       11
        
       glibPreInstallPhase() {

pkgs/development/libraries/glibc/2.26-75to115.diff.gz

This is a binary file and will not be displayed.

+39

pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch

···

       1
       1
       +
       diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure

     

       2
       2
       +
       index cace758c01..38fe7fe0b0 100644

     

       3
       3
       +
       --- a/sysdeps/unix/sysv/linux/configure

     

       4
       4
       +
       +++ b/sysdeps/unix/sysv/linux/configure

     

       5
       5
       +
       @@ -69,7 +69,7 @@ fi

     

       6
       6
       +
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5

     

       7
       7
       +
        $as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; }

     

       8
       8
       +
        decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;

     

       9
       9
       +
       -abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;

     

       10
       10
       +
       +abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;

     

       11
       11
       +
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext

     

       12
       12
       +
        /* end confdefs.h.  */

     

       13
       13
       +
        #include <linux/version.h>

     

       14
       14
       +
       diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac

     

       15
       15
       +
       index 13abda0a51..6abc12eaed 100644

     

       16
       16
       +
       --- a/sysdeps/unix/sysv/linux/configure.ac

     

       17
       17
       +
       +++ b/sysdeps/unix/sysv/linux/configure.ac

     

       18
       18
       +
       @@ -50,7 +50,7 @@ fi

     

       19
       19
       +
        AC_MSG_CHECKING(for kernel header at least $minimum_kernel)

     

       20
       20
       +
        changequote(,)dnl

     

       21
       21
       +
        decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;

     

       22
       22
       +
       -abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;

     

       23
       23
       +
       +abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;

     

       24
       24
       +
        changequote([,])dnl

     

       25
       25
       +
        AC_TRY_COMPILE([#include <linux/version.h>

     

       26
       26
       +
        #if LINUX_VERSION_CODE < $decnum

     

       27
       27
       +
       diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h

     

       28
       28
       +
       index 823cd8224d..482caaeeec 100644

     

       29
       29
       +
       --- a/sysdeps/unix/sysv/linux/dl-osinfo.h

     

       30
       30
       +
       +++ b/sysdeps/unix/sysv/linux/dl-osinfo.h

     

       31
       31
       +
       @@ -39,7 +39,7 @@

     

       32
       32
       +
        	  GLRO(dl_osversion) = version;					      \

     

       33
       33
       +
        									      \

     

       34
       34
       +
        	/* Now we can test with the required version.  */		      \

     

       35
       35
       +
       -	if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION)   \

     

       36
       36
       +
       +	if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION && version != 0x020620)   \

     

       37
       37
       +
        	  /* Not sufficent.  */						      \

     

       38
       38
       +
        	  FATAL ("FATAL: kernel too old\n");				      \

     

       39
       39
       +
              }									      \

+22 -2

pkgs/development/libraries/glibc/common.nix

···

       20
       20
        
       

     

       21
       21
        
       let

     

       22
       22
        
         version = "2.26";

     

       23
       23
       -
         patchSuffix = "-75";

     

       23
       23
       +
         patchSuffix = "-115";

     

       24
       24
        
         sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5";

     

       25
       25
        
         cross = if buildPlatform != hostPlatform then hostPlatform else null;

     

       26
       26
        
       in

     
···

       47
       47
        
                 $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz

     

       48
       48
        
             */

     

       49
       49
        
             ./2.26-75.patch.gz

     

       50
       50
       +
             ./2.26-75to115.diff.gz

     

       50
       51
        
       

     

       51
       52
        
             /* Have rpcgen(1) look for cpp(1) in $PATH.  */

     

       52
       53
        
             ./rpcgen-path.patch

     
···

       64
       65
        
                "/bin:/usr/bin", which is inappropriate on NixOS machines. This

     

       65
       66
        
                patch extends the search path by "/run/current-system/sw/bin". */

     

       66
       67
        
             ./fix_path_attribute_in_getconf.patch

     

       68
       68
       +
       

     

       69
       69
       +
             /* Allow running with RHEL 6 -like kernels.  The patch adds an exception

     

       70
       70
       +
               for glibc to accept 2.6.32 and to tag the ELFs as 2.6.32-compatible

     

       71
       71
       +
               (otherwise the loader would refuse libc).

     

       72
       72
       +
               Note that glibc will fully work only on their heavily patched kernels

     

       73
       73
       +
               and we lose early mismatch detection on 2.6.32.

     

       74
       74
       +
       

     

       75
       75
       +
               On major glibc updates we should check that the patched kernel supports

     

       76
       76
       +
               all the required features.  ATM it's verified up to glibc-2.26-115.

     

       77
       77
       +
               # HOWTO: check glibc sources for changes in kernel requirements

     

       78
       78
       +
               git log -p glibc-2.25.. sysdeps/unix/sysv/linux/x86_64/kernel-features.h sysdeps/unix/sysv/linux/kernel-features.h

     

       79
       79
       +
               # get kernel sources (update the URL)

     

       80
       80
       +
               mkdir tmp && cd tmp

     

       81
       81
       +
               curl http://vault.centos.org/6.9/os/Source/SPackages/kernel-2.6.32-696.el6.src.rpm | rpm2cpio - | cpio -idmv

     

       82
       82
       +
               tar xf linux-*.bz2

     

       83
       83
       +
               # check syscall presence, for example

     

       84
       84
       +
               less linux-*?/arch/x86/kernel/syscall_table_32.S

     

       85
       85
       +
              */

     

       86
       86
       +
             ./allow-kernel-2.6.32.patch

     

       67
       87
        
           ]

     

       68
       88
        
           ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch;

     

       69
       89
        
       

     
···

       121
       141
        
       

     

       122
       142
        
         outputs = [ "out" "bin" "dev" "static" ];

     

       123
       143
        
       

     

       124
       124
       -
         nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc;

     

       144
       144
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       125
       145
        
         buildInputs = lib.optionals withGd [ gd libpng ];

     

       126
       146
        
       

     

       127
       147
        
         # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to

+2 -2

pkgs/development/libraries/gmp/6.x.nix

···

       19
       19
        
         outputs = [ "out" "dev" "info" ];

     

       20
       20
        
         passthru.static = self.out;

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ m4 ]

     

       23
       23
       -
           ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc;

     

       22
       22
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       23
       23
       +
         nativeBuildInputs = [ m4 ];

     

       24
       24
        
       

     

       25
       25
        
         configureFlags =

     

       26
       26
        
           # Build a "fat binary", with routines for several sub-architectures

+9 -3

pkgs/development/libraries/gobject-introspection/setup-hook.sh

···

       1
       1
        
       make_gobject_introspection_find_gir_files() {

     

       2
       2
       -
       

     

       3
       2
        
           # required for .typelib files, eg mypaint git version

     

       4
       3
        
           if [ -d "$1/lib/girepository-1.0" ]; then

     

       5
       4
        
             addToSearchPath GI_TYPELIB_PATH $1/lib/girepository-1.0

     
···

       11
       10
        
           fi

     

       12
       11
        
       }

     

       13
       12
        
       

     

       14
       14
       -
       envHooks+=(make_gobject_introspection_find_gir_files)

     

       13
       13
       +
       addEnvHooks "$hostOffset" make_gobject_introspection_find_gir_files

     

       14
       14
       +
       

     

       15
       15
       +
       giDiscoverSelf() {

     

       16
       16
       +
           if [ -d "$prefix/lib/girepository-1.0" ]; then

     

       17
       17
       +
             addToSearchPath GI_TYPELIB_PATH $prefix/lib/girepository-1.0

     

       18
       18
       +
           fi

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       preFixupHooks+=(giDiscoverSelf)

     

       15
       22
        
       

     

       16
       23
        
       _multioutMoveGlibGir() {

     

       17
       24
        
         moveToOutput share/gir-1.0 "${!outputDev}"

     

       18
       25
        
       }

     

       19
       26
        
       

     

       20
       27
        
       preFixupHooks+=(_multioutMoveGlibGir)

     

       21
       21
       -

+1 -5

pkgs/development/libraries/grantlee/5/setup-hook.sh

···

       10
       10
        
               propagatedUserEnvPkgs+=" $1"

     

       11
       11
        
           fi

     

       12
       12
        
       }

     

       13
       13
       -
       if [ "$crossEnv" ]; then

     

       14
       14
       -
           crossEnvHooks+=(_grantleeEnvHook)

     

       15
       15
       -
       else

     

       16
       16
       -
           envHooks+=(_grantleeEnvHook)

     

       17
       17
       -
       fi

     

       13
       13
       +
       addEnvHooks "$hostOffset" _grantleeEnvHook

+1 -1

pkgs/development/libraries/gstreamer/core/setup-hook.sh

···

       5
       5
        
           fi

     

       6
       6
        
       }

     

       7
       7
        
       

     

       8
       8
       -
       envHooks+=(addGstreamer1LibPath)

     

       8
       8
       +
       addEnvHooks "$hostOffset" addGstreamer1LibPath

     

       9
       9

+1 -1

pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh

···

       5
       5
        
           fi

     

       6
       6
        
       }

     

       7
       7
        
       

     

       8
       8
       -
       envHooks+=(addGstreamerLibPath)

     

       8
       8
       +
       addEnvHooks "$hostOffset" addGstreamerLibPath

+2 -2

pkgs/development/libraries/gtk+/2.x.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg

     

       2
       2
       -
       , gdk_pixbuf, libintlOrEmpty, xlibsWrapper

     

       2
       2
       +
       , gdk_pixbuf, libintlOrEmpty, xlibsWrapper, gobjectIntrospection

     

       3
       3
        
       , xineramaSupport ? stdenv.isLinux

     

       4
       4
        
       , cupsSupport ? true, cups ? null

     

       5
       5
        
       , gdktarget ? "x11"

     
···

       28
       28
        
       

     

       29
       29
        
         setupHook = ./setup-hook.sh;

     

       30
       30
        
       

     

       31
       31
       -
         nativeBuildInputs = [ setupHook perl pkgconfig gettext ];

     

       31
       31
       +
         nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ];

     

       32
       32
        
       

     

       33
       33
        
         patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ];

     

       34
       34

+2 -2

pkgs/development/libraries/kdb/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib, fetchurl,

     

       3
       3
        
         extra-cmake-modules,

     

       4
       4
       -
         qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql

     

       4
       4
       +
         qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       mkDerivation rec {

     
···

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ];

     

       19
       19
       +
         buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ];

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ qtbase ];

     

       22
       22

+1 -1

pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh

···

       2
       2
        
           addToSearchPath XDG_DATA_DIRS "$1/share"

     

       3
       3
        
           addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"

     

       4
       4
        
       }

     

       5
       5
       -
       envHooks+=(_ecmEnvHook)

     

       5
       5
       +
       addEnvHooks "$targetOffset" _ecmEnvHook

     

       6
       6
        
       

     

       7
       7
        
       _ecmPreConfigureHook() {

     

       8
       8
        
           # Because we need to use absolute paths here, we must set *all* the paths.

+11 -3

pkgs/development/libraries/kde-frameworks/kdoctools/default.nix

···

       8
       8
        
       mkDerivation {

     

       9
       9
        
         name = "kdoctools";

     

       10
       10
        
         meta = { maintainers = [ lib.maintainers.ttuegel ]; };

     

       11
       11
       -
         nativeBuildInputs = [ extra-cmake-modules ];

     

       12
       12
       -
         propagatedNativeBuildInputs = [ perl perlPackages.URI ];

     

       11
       11
       +
         nativeBuildInputs = [

     

       12
       12
       +
           extra-cmake-modules

     

       13
       13
       +
           # The build system insists on having native Perl.

     

       14
       14
       +
           perl perlPackages.URI

     

       15
       15
       +
         ];

     

       16
       16
       +
         propagatedBuildInputs = [

     

       17
       17
       +
           # kdoctools at runtime actually needs Perl for the platform kdoctools is

     

       18
       18
       +
           # running on, not necessarily native perl.

     

       19
       19
       +
           perl perlPackages.URI

     

       20
       20
       +
           qtbase

     

       21
       21
       +
         ];

     

       13
       22
        
         buildInputs = [ karchive ki18n ];

     

       14
       14
       -
         propagatedBuildInputs = [ qtbase ];

     

       15
       23
        
         outputs = [ "out" "dev" ];

     

       16
       24
        
         patches = [ ./kdoctools-no-find-docbook-xml.patch ];

     

       17
       25
        
         cmakeFlags = [

+1 -1

pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh

···

       2
       2
        
           addToSearchPath XDG_DATA_DIRS "$1/share"

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addXdgData)

     

       5
       5
       +
       addEnvHooks "$targetOffset" addXdgData

+3 -2

pkgs/development/libraries/libagar/default.nix

···

       20
       20
        
           "--with-gettext=${gettext}"

     

       21
       21
        
           "--with-jpeg=${libjpeg.dev}"

     

       22
       22
        
           "--with-gl=${mesa}"

     

       23
       23
       -
           "--with-mysql=yes"

     

       23
       23
       +
           "--with-mysql=${mysql.connector-c}"

     

       24
       24
        
           "--with-manpages=yes"

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         outputs = [ "out" "devdoc" ];

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ pkgconfig libtool gettext ];

     

       30
       30
       +
       

     

       30
       31
        
         buildInputs = [

     

       31
       31
       -
           bsdbuild perl xlibsWrapper libXinerama SDL mesa  mysql.client mandoc

     

       32
       32
       +
           bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.connector-c mandoc

     

       32
       33
        
           freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile

     

       33
       34
        
         ];

     

       34
       35

+2 -2

pkgs/development/libraries/libassuan/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pth, libgpgerror }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libassuan-2.4.3";

     

       4
       4
       +
         name = "libassuan-2.5.1";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://gnupg/libassuan/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "0w9bmasln4z8mn16s1is55a06w3nv8jbyal496z5jvr5vcxkm112";

     

       8
       8
       +
           sha256 = "0jb4nb4nrjr949gd3lw8lh4v5d6qigxaq6xwy24w5apjnhvnrya7";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" "info" ];

+11 -7

pkgs/development/libraries/libdbi-drivers/default.nix

···

       1
       1
        
       { stdenv, fetchurl, libdbi

     

       2
       2
       -
       , libmysql ? null, sqlite ? null, postgresql ? null

     

       2
       2
       +
       , mysql ? null

     

       3
       3
       +
       , sqlite ? null

     

       4
       4
       +
       , postgresql ? null

     

       3
       5
        
       }:

     

       4
       6
        
       

     

       5
       7
        
       with stdenv.lib;

     
···

       11
       13
        
           sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";

     

       12
       14
        
         };

     

       13
       15
        
       

     

       14
       14
       -
         buildInputs = [ libdbi libmysql sqlite postgresql ];

     

       16
       16
       +
         buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c;

     

       15
       17
        
       

     

       16
       18
        
         postPatch = ''

     

       17
       19
        
           sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;

     
···

       24
       26
        
           "--enable-libdbi"

     

       25
       27
        
           "--with-dbi-incdir=${libdbi}/include"

     

       26
       28
        
           "--with-dbi-libdir=${libdbi}/lib"

     

       27
       27
       -
         ] ++ optionals (libmysql != null) [

     

       29
       29
       +
         ] ++ optionals (mysql != null) [

     

       28
       30
        
           "--with-mysql"

     

       29
       29
       -
         ] ++ optionals (postgresql != null) [

     

       30
       30
       -
           "--with-pgsql"

     

       31
       31
       -
           "--with-pgsql_incdir=${postgresql}/include"

     

       32
       32
       -
           "--with-pgsql_libdir=${postgresql.lib}/lib"

     

       31
       31
       +
           "--with-mysql-incdir=${mysql.connector-c}/include/mysql"

     

       32
       32
       +
           "--with-mysql-libdir=${mysql.connector-c}/lib/mysql"

     

       33
       33
        
         ] ++ optionals (sqlite != null) [

     

       34
       34
        
           "--with-sqlite3"

     

       35
       35
        
           "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"

     

       36
       36
        
           "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite"

     

       37
       37
       +
         ] ++ optionals (postgresql != null) [

     

       38
       38
       +
           "--with-pgsql"

     

       39
       39
       +
           "--with-pgsql_incdir=${postgresql}/include"

     

       40
       40
       +
           "--with-pgsql_libdir=${postgresql.lib}/lib"

     

       37
       41
        
         ];

     

       38
       42
        
       

     

       39
       43
        
         installFlags = [ "DESTDIR=\${out}" ];

+2 -2

pkgs/development/libraries/libdrm/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libdrm-2.4.88";

     

       4
       4
       +
         name = "libdrm-2.4.89";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "b5e55dbac2124e742e639f5b8553e8b7395863bf73dab4f77e99fe2fc25572b5";

     

       8
       8
       +
           sha256 = "629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" "bin" ];

+15 -7

pkgs/development/libraries/libelf/default.nix

···

       1
       1
       -
       { stdenv, fetchurl

     

       2
       2
       -
       , gettext, glibc

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchurl, autoreconfHook, gettext

     

       3
       3
        
       , buildPlatform, hostPlatform

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       17
       17
        
       

     

       18
       18
        
         doCheck = true;

     

       19
       19
        
       

     

       20
       20
       -
         # Libelf's custom NLS macros fail to determine the catalog file extension on

     

       21
       21
       -
         # Darwin, so disable NLS for now.

     

       22
       22
       -
         # FIXME: Eventually make Gettext a build input on all platforms.

     

       23
       23
       -
         configureFlags = stdenv.lib.optional hostPlatform.isDarwin "--disable-nls";

     

       20
       20
       +
         configureFlags = []

     

       21
       21
       +
              # Configure check for dynamic lib support is broken, see

     

       22
       22
       +
              # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html

     

       23
       23
       +
           ++ stdenv.lib.optional (hostPlatform != buildPlatform) "mr_cv_target_elf=yes"

     

       24
       24
       +
              # Libelf's custom NLS macros fail to determine the catalog file extension

     

       25
       25
       +
              # on Darwin, so disable NLS for now.

     

       26
       26
       +
           ++ stdenv.lib.optional hostPlatform.isDarwin "--disable-nls";

     

       24
       27
        
       

     

       25
       25
       -
         nativeBuildInputs = [ gettext ];

     

       28
       28
       +
         nativeBuildInputs = [ gettext ]

     

       29
       29
       +
              # Need to regenerate configure script with newer version in order to pass

     

       30
       30
       +
              # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`

     

       31
       31
       +
              # which doesn't work with the bootstrapTools bash, so can only do this

     

       32
       32
       +
              # for cross builds when `stdenv.shell` is a newer bash.

     

       33
       33
       +
           ++ stdenv.lib.optional (hostPlatform != buildPlatform) autoreconfHook;

     

       26
       34
        
       

     

       27
       35
        
         meta = {

     

       28
       36
        
           description = "ELF object file access library";

+2 -2

pkgs/development/libraries/libgcrypt/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "libgcrypt-${version}";

     

       7
       7
       -
         version = "1.8.1";

     

       7
       7
       +
         version = "1.8.2";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";

     

       11
       11
       -
           sha256 = "1cvqd9jk5qshbh48yh3ixw4zyr4n5k50r3475rrh20xfn7w7aa3s";

     

       11
       11
       +
           sha256 = "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         outputs = [ "out" "dev" "info" ];

+2 -2

pkgs/development/libraries/libnftnl/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, libmnl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "libnftnl-1.0.7";

     

       4
       4
       +
         name = "libnftnl-1.0.8";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "10irjrylcfkbp11617yr19vpfhgl54w0kw02jhj0i1abqv5nxdlv";

     

       8
       8
       +
           sha256 = "0f10cfiyl4c0f8k3brxfrw28x7a6qvrakaslg4jgqncwxycxggg6";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig ];

+2 -1

pkgs/development/libraries/libopcodes/default.nix

···

       19
       19
        
           find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"/<bfd.h>/' \;

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ autoreconfHook264 bison buildPackages.stdenv.cc ];

     

       22
       22
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       23
       23
       +
         nativeBuildInputs = [ autoreconfHook264 bison ];

     

       23
       24
        
         buildInputs = [ libiberty ];

     

       24
       25
        
         # dis-asm.h includes bfd.h

     

       25
       26
        
         propagatedBuildInputs = [ libbfd ];

+1 -1

pkgs/development/libraries/librdf/redland.nix

···

       17
       17
        
         nativeBuildInputs = [ perl pkgconfig ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ openssl libxslt curl pcre libxml2 ]

     

       20
       20
       -
           ++ stdenv.lib.optional withMysql mysql

     

       20
       20
       +
           ++ stdenv.lib.optional withMysql mysql.connector-c

     

       21
       21
        
           ++ stdenv.lib.optional withSqlite sqlite

     

       22
       22
        
           ++ stdenv.lib.optional withPostgresql postgresql

     

       23
       23
        
           ++ stdenv.lib.optional withBdb db;

+1 -1

pkgs/development/libraries/librep/setup-hook.sh

···

       2
       2
        
           addToSearchPath REP_DL_LOAD_PATH $1/lib/rep

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addRepDLLoadPath)

     

       5
       5
       +
       addEnvHooks "$hostOffset" addRepDLLoadPath

+2 -2

pkgs/development/libraries/mesa/default.nix

···

       66
       66
        
       in

     

       67
       67
        
       

     

       68
       68
        
       let

     

       69
       69
       -
         version = "17.2.7";

     

       69
       69
       +
         version = "17.2.8";

     

       70
       70
        
         branch  = head (splitString "." version);

     

       71
       71
        
         driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";

     

       72
       72
        
       in

     
···

       81
       81
        
             "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"

     

       82
       82
        
             "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"

     

       83
       83
        
           ];

     

       84
       84
       -
           sha256 = "0s3slgjxnx482yw0knn4a6alsy2cq28rah6hnjbmf12mvyldxksh";

     

       84
       84
       +
           sha256 = "0pq9kmmyllgd63d936f3x1zsg7sqaswx47khbn0gvbgari2h753f";

     

       85
       85
        
         };

     

       86
       86
        
       

     

       87
       87
        
         prePatch = "patchShebangs .";

+2 -1

pkgs/development/libraries/ncurses/default.nix

···

       37
       37
        
         # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:

     

       38
       38
        
         CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";

     

       39
       39
        
       

     

       40
       40
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       40
       41
        
         nativeBuildInputs = [

     

       41
       42
        
           pkgconfig

     

       42
       43
        
         ] ++ lib.optionals (buildPlatform != hostPlatform) [

     

       43
       43
       -
           buildPackages.ncurses buildPackages.stdenv.cc

     

       44
       44
       +
           buildPackages.ncurses

     

       44
       45
        
         ];

     

       45
       46
        
         buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;

     

       46
       47

+3 -3

pkgs/development/libraries/opendbx/default.nix

···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         preConfigure = ''

     

       15
       15
       -
           export CPPFLAGS="-I${getDev mysql.client}/include/mysql"

     

       16
       16
       -
           export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib"

     

       15
       15
       +
           export CPPFLAGS="-I${mysql.connector-c}/include/mysql"

     

       16
       16
       +
           export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"

     

       17
       17
        
           configureFlagsArray=(--with-backends="mysql pgsql sqlite3")

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ readline mysql.client postgresql sqlite ];

     

       20
       20
       +
         buildInputs = [ readline mysql.connector-c postgresql sqlite ];

     

       21
       21
        
       }

+3

pkgs/development/libraries/pcre/default.nix

···

       33
       33
        
       

     

       34
       34
        
         buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads;

     

       35
       35
        
       

     

       36
       36
       +
         # https://bugs.exim.org/show_bug.cgi?id=2173

     

       37
       37
       +
         patches = [ ./stacksize-detection.patch ];

     

       38
       38
       +
       

     

       36
       39
        
         doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform;

     

       37
       40
        
           # XXX: test failure on Cygwin

     

       38
       41
        
           # we are running out of stack on both freeBSDs on Hydra

+16

pkgs/development/libraries/pcre/stacksize-detection.patch

···

       1
       1
       +
       diff --git a/pcre_exec.c b/pcre_exec.c

     

       2
       2
       +
       --- a/pcre_exec.c

     

       3
       3
       +
       +++ b/pcre_exec.c

     

       4
       4
       +
       @@ -509,6 +509,12 @@

     

       5
       5
       +
                         (e.g. stopped by repeated call or recursion limit)

     

       6
       6
       +
        */

     

       7
       7
       +
        

     

       8
       8
       +
       +#ifdef __GNUC__

     

       9
       9
       +
       +static int

     

       10
       10
       +
       +match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,

     

       11
       11
       +
       +  PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,

     

       12
       12
       +
       +  unsigned int rdepth) __attribute__((noinline,noclone));

     

       13
       13
       +
       +#endif

     

       14
       14
       +
        static int

     

       15
       15
       +
        match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,

     

       16
       16
       +
          PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,

+2 -3

pkgs/development/libraries/poco/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysql }:

     

       1
       1
       +
       { stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "poco-${version}";

     
···

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ cmake pkgconfig ];

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ];

     

       15
       15
       +
         buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];

     

       16
       16
        
       

     

       17
       17
        
         cmakeFlags = [

     

       18
       18
       -
           "-DMYSQL_INCLUDE_DIR=${libmysql.dev}/include/mysql"

     

       19
       18
        
           "-DPOCO_UNBUNDLED=ON"

     

       20
       19
        
         ];

     

       21
       20

+1 -1

pkgs/development/libraries/qt-3/default.nix

···

       49
       49
        
             -I${randrproto}/include" else "-no-xrandr"}

     

       50
       50
        
           ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"}

     

       51
       51
        
           ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""}

     

       52
       52
       -
           ${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" else ""}

     

       52
       52
       +
           ${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql" else ""}

     

       53
       53
        
           ${if xftSupport then "-xft

     

       54
       54
        
             -L${libXft.out}/lib -I${libXft.dev}/include

     

       55
       55
        
             -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include

+1 -1

pkgs/development/libraries/qt-4.x/4.8/default.nix

···

       160
       160
        
         buildInputs =

     

       161
       161
        
           [ cups # Qt dlopen's libcups instead of linking to it

     

       162
       162
        
             postgresql sqlite libjpeg libmng libtiff icu ]

     

       163
       163
       -
           ++ optionals (mysql != null) [ mysql.lib ]

     

       163
       163
       +
           ++ optionals (mysql != null) [ mysql.connector-c ]

     

       164
       164
        
           ++ optionals gtkStyle [ gtk2 gdk_pixbuf ]

     

       165
       165
        
           ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];

     

       166
       166

+1 -5

pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh

···

       42
       42
        
               propagatedUserEnvPkgs+=" $1"

     

       43
       43
        
           fi

     

       44
       44
        
       }

     

       45
       45
       -
       if [ "$crossConfig" ]; then

     

       46
       46
       -
          crossEnvHooks+=(qtEnvHook)

     

       47
       47
       -
       else

     

       48
       48
       -
          envHooks+=(qtEnvHook)

     

       49
       49
       -
       fi

     

       45
       45
       +
       envHostTargetHooks+=(qtEnvHook)

     

       50
       46
        
       

     

       51
       47
        
       postPatchMkspecs() {

     

       52
       48
        
           local bin="${!outputBin}"

+1 -1

pkgs/development/libraries/qt-5/modules/qtbase.nix

···

       80
       80
        
           )

     

       81
       81
        
           ++ lib.optional developerBuild gdb

     

       82
       82
        
           ++ lib.optional (cups != null) cups

     

       83
       83
       -
           ++ lib.optional (mysql != null) mysql.lib

     

       83
       83
       +
           ++ lib.optional (mysql != null) mysql.connector-c

     

       84
       84
        
           ++ lib.optional (postgresql != null) postgresql;

     

       85
       85
        
       

     

       86
       86
        
         nativeBuildInputs =

+1 -1

pkgs/development/libraries/rep-gtk/setup-hook.sh

···

       2
       2
        
           addToSearchPath REP_DL_LOAD_PATH $1/lib/rep

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addRepDLLoadPath)

     

       5
       5
       +
       addEnvHooks "$hostOffset" addRepDLLoadPath

+1 -1

pkgs/development/libraries/slib/setup-hook.sh

···

       10
       10
        
           fi

     

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
       -
       envHooks+=(addSlibPath)

     

       13
       13
       +
       addEnvHooks "$hostOffset" addSlibPath

+1 -1

pkgs/development/libraries/tntdb/default.nix

···

       8
       8
        
           sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ cxxtools postgresql mysql sqlite zlib openssl ];

     

       11
       11
       +
         buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];

     

       12
       12
        
       

     

       13
       13
        
         enableParallelBuilding = true;

     

       14
       14

+2 -10

pkgs/development/libraries/unixODBCDrivers/default.nix

···

       37
       37
        
           };

     

       38
       38
        
       

     

       39
       39
        
           nativeBuildInputs = [ cmake ];

     

       40
       40
       -
           buildInputs = [ unixODBC mariadb.lib ];

     

       40
       40
       +
           buildInputs = [ unixODBC mariadb.connector-c ];

     

       41
       41
        
       

     

       42
       42
        
           cmakeFlags = [

     

       43
       43
       -
             "-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql"

     

       43
       43
       +
             "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"

     

       44
       44
        
           ];

     

       45
       45
        
       

     

       46
       46
       -
           preConfigure = ''

     

       47
       47
       -
             sed -i \

     

       48
       48
       -
               -e 's,mariadb_config,mysql_config,g' \

     

       49
       49
       -
               -e 's,libmariadbclient,libmysqlclient,g' \

     

       50
       50
       -
               cmake/FindMariaDB.cmake

     

       51
       51
       -
           '';

     

       52
       52
       -
       

     

       53
       46
        
           passthru = {

     

       54
       47
        
             fancyName = "MariaDB";

     

       55
       48
        
             driver = "lib/libmyodbc3-3.51.12.so";

     
···

       60
       53
        
             homepage =  https://downloads.mariadb.org/connector-odbc/;

     

       61
       54
        
             license = licenses.gpl2;

     

       62
       55
        
             platforms = platforms.linux;

     

       63
       63
       -
             broken = true;

     

       64
       56
        
           };

     

       65
       57
        
         };

     

       66
       58

+3 -3

pkgs/development/libraries/wt/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu

     

       2
       2
       -
       , pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl

     

       2
       2
       +
       , pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl

     

       3
       3
        
       , pcre

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       19
       19
        
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
        
         buildInputs = [

     

       21
       21
        
           cmake boost doxygen qt48Full libharu

     

       22
       22
       -
           pango fcgi firebird libmysql postgresql graphicsmagick glew

     

       22
       22
       +
           pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew

     

       23
       23
        
           openssl pcre

     

       24
       24
        
         ];

     

       25
       25
        
       

     
···

       27
       27
        
           "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"

     

       28
       28
        
           "-DWT_CPP_11_MODE=-std=c++11"

     

       29
       29
        
           "-DGM_PREFIX=${graphicsmagick}"

     

       30
       30
       -
           "-DMYSQL_PREFIX=${libmysql.dev}"

     

       30
       30
       +
           "-DMYSQL_PREFIX=${mysql.connector-c}"

     

       31
       31
        
           "--no-warn-unused-cli"

     

       32
       32
        
         ];

     

       33
       33

+1 -1

pkgs/development/libraries/xapian/default.nix

···

       36
       36
        
       in {

     

       37
       37
        
         # xapian-ruby needs 1.2.22 as of 2017-05-06

     

       38
       38
        
         xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";

     

       39
       39
       -
         xapian_1_4_4 = generic "1.4.4" "1n9j2w2as0flih3hgim7gprfxsx6gimijs91rxsjsi8shjlqbad6";

     

       39
       39
       +
         xapian_1_4 = generic "1.4.5" "0axhqrj202hbll9mcx1qdm8gsqj19216w3z02gyjbycxvr9gkdc5";

     

       40
       40
        
       }

+1 -1

pkgs/development/libraries/xapian/tools/omega/default.nix

···

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "0pl9gs0sbavxykfgrkm8syswqnfynmmqhf8429bv8a5qjh5pkp8l";

     

       9
       9
       +
           sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ xapian perl pcre zlib libmagic ];

+1 -1

pkgs/development/lisp-modules/clwrapper/setup-hook.sh

···

       31
       31
        
       

     

       32
       32
        
       export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF

     

       33
       33
        
       

     

       34
       34
       -
       envHooks+=(addASDFPaths setLisp collectNixLispLDLP)

     

       34
       34
       +
       addEnvHooks "$targetOffset" addASDFPaths setLisp collectNixLispLDLP

     

       35
       35
        
       

     

       36
       36
        
       mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home"

     

       37
       37
        
       mkdir -p "$HOME"/.cache/common-lisp

+3 -3

pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix

···

       53
       53
        
         cl-async-ssl = addNativeLibs [pkgs.openssl];

     

       54
       54
        
         cl-async-test = addNativeLibs [pkgs.openssl];

     

       55
       55
        
         clsql = x: {

     

       56
       56
       -
           propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib];

     

       56
       56
       +
           propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];

     

       57
       57
        
           overrides = y: (x.overrides y) // {

     

       58
       58
        
             preConfigure = ((x.overrides y).preConfigure or "") + ''

     

       59
       59
       -
               export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql"

     

       60
       60
       -
               export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql"

     

       59
       59
       +
               export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql"

     

       60
       60
       +
               export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql"

     

       61
       61
        
             '';

     

       62
       62
        
           };

     

       63
       63
        
         };

+2 -2

pkgs/development/lisp-modules/shell.nix

···

       5
       5
        
         env = buildEnv { name = name; paths = buildInputs; };

     

       6
       6
        
         buildInputs = [

     

       7
       7
        
           gcc stdenv

     

       8
       8
       -
           openssl fuse libuv mariadb libfixposix libev sqlite

     

       8
       8
       +
           openssl fuse libuv mysql.connector-c libfixposix libev sqlite

     

       9
       9
        
           freetds

     

       10
       10
        
           lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info

     

       11
       11
        
         ];

     

       12
       12
        
         CPATH = "${libfixposix}/include";

     

       13
       13
       -
         LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib";

     

       13
       13
       +
         LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib";

     

       14
       14
        
       };

     

       15
       15
        
       in stdenv.mkDerivation self

+1 -1

pkgs/development/ocaml-modules/eliom/setup-hook.sh

···

       2
       2
        
           addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addOcsigenDistilleryTemplate)

     

       5
       5
       +
       addEnvHooks "$hostOffset" addOcsigenDistilleryTemplate

+9 -2

pkgs/development/ocaml-modules/mysql/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, ocaml, findlib, mysql }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }:

     

       2
       2
        
       

     

       3
       3
        
       # TODO: la versione stabile da' un errore di compilazione dovuto a

     

       4
       4
        
       # qualche cambiamento negli header .h

     
···

       26
       26
        
       

     

       27
       27
        
         createFindlibDestdir = true;

     

       28
       28
        
       

     

       29
       29
       -
         propagatedBuildInputs = [ mysql.client ];

     

       29
       29
       +
         propagatedBuildInputs = [ mysql.connector-c ];

     

       30
       30
       +
       

     

       31
       31
       +
         patches = [

     

       32
       32
       +
           (fetchpatch {

     

       33
       33
       +
             url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.patch";

     

       34
       34
       +
             sha256 = "0018s2wcrvbsw9yaqmwq500qmikwffrgdp5xg9b8v7ixhd4gi6hn";

     

       35
       35
       +
           })

     

       36
       36
       +
         ];

     

       30
       37
        
       

     

       31
       38
        
         meta = {

     

       32
       39
        
           homepage = http://ocaml-mysql.forge.ocamlcore.org;

+1 -1

pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh

···

       2
       2
        
           export OCAMLMAKEFILE="@out@/include/OCamlMakefile"

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addOcamlMakefile)

     

       5
       5
       +
       addEnvHooks "$targetOffset" addOcamlMakefile

+1 -1

pkgs/development/perl-modules/DBD-mysql/default.nix

···

       8
       8
        
           sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ mysql.lib ] ;

     

       11
       11
       +
         buildInputs = [ mysql.connector-c ] ;

     

       12
       12
        
         propagatedBuildInputs = [ DBI ];

     

       13
       13
        
       

     

       14
       14
        
         doCheck = false;

+3 -3

pkgs/development/pure-modules/glpk/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl,

     

       2
       2
       -
         pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }:

     

       2
       2
       +
         pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         baseName = "glpk";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         glpkWithExtras = lib.overrideDerivation glpk (attrs: {

     

       15
       15
       -
           propagatedBuildInputs = [ gmp libtool libmysql libiodbc ];

     

       15
       15
       +
           propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ];

     

       16
       16
        
       

     

       17
       17
        
           CPPFLAGS = "-I${gmp.dev}/include";

     

       18
       18
        
       

     

       19
       19
        
           preConfigure = ''

     

       20
       20
        
             substituteInPlace configure \

     

       21
       21
       -
               --replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql

     

       21
       21
       +
               --replace /usr/include/mysql ${mysql.connector-c}/include/mysql

     

       22
       22
        
           '';

     

       23
       23
        
           configureFlags = [ "--enable-dl"

     

       24
       24
        
                              "--enable-odbc"

+2 -2

pkgs/development/python-modules/APScheduler/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "APScheduler";

     

       23
       23
       -
         version = "3.4.0";

     

       23
       23
       +
         version = "3.5.0";

     

       24
       24
        
         name = "${pname}-${version}";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchPypi {

     

       27
       27
        
           inherit pname version;

     

       28
       28
       -
           sha256 = "b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316";

     

       28
       28
       +
           sha256 = "1ce44d5132b7951f4614067c88ca34cfee1ff97f6f0892581d79b636d83eab89";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [

+32

pkgs/development/python-modules/Mako/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , markupsafe

     

       5
       5
       +
       , nose

     

       6
       6
       +
       , mock

     

       7
       7
       +
       , pytest

     

       8
       8
       +
       , isPyPy

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "Mako";

     

       13
       13
       +
         version = "1.0.7";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchPypi {

     

       16
       16
       +
           inherit pname version;

     

       17
       17
       +
           sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         checkInputs = [ markupsafe nose mock pytest ];

     

       21
       21
       +
         propagatedBuildInputs = [ markupsafe ];

     

       22
       22
       +
       

     

       23
       23
       +
         doCheck = !isPyPy;  # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25

     

       24
       24
       +
       

     

       25
       25
       +
         meta = {

     

       26
       26
       +
           description = "Super-fast templating language";

     

       27
       27
       +
           homepage = http://www.makotemplates.org;

     

       28
       28
       +
           license = lib.licenses.mit;

     

       29
       29
       +
           platforms = lib.platforms.unix;

     

       30
       30
       +
           maintainers = with lib.maintainers; [ domenkozar ];

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+5 -5

pkgs/development/python-modules/MechanicalSoup/default.nix

···

       1
       1
        
       { fetchPypi, buildPythonPackage, lib

     

       2
       2
       -
       , requests, beautifulsoup4, six

     

       2
       2
       +
       , requests, beautifulsoup4, six, lxml

     

       3
       3
        
       , pytestrunner, requests-mock, pytestcov, pytest

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         name = "${pname}-${version}";

     

       9
       9
        
         pname = "MechanicalSoup";

     

       10
       10
       -
         version = "0.8.0";

     

       10
       10
       +
         version = "0.9.0.post4";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da";

     

       14
       14
       +
           sha256 = "ce8f822afbc9bef1499be417e8d5deecd0cd32606420165700e89477955f03ab";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         checkInputs = [ pytest pytestrunner requests-mock pytestcov ];

     

       18
       18
        
       

     

       19
       19
       -
         propagatedBuildInputs = [ requests beautifulsoup4 six ];

     

       19
       19
       +
         propagatedBuildInputs = [ lxml requests beautifulsoup4 six ];

     

       20
       20
        
       

     

       21
       21
        
         # Requires network

     

       22
       22
        
         doCheck = false;

     

       23
       23
        
       

     

       24
       24
        
         postPatch = ''

     

       25
       25
        
           # Is in setup_requires but not used in setup.py...

     

       26
       26
       -
           substituteInPlace setup.py --replace "'pytest-runner'," ""

     

       26
       26
       +
           substituteInPlace setup.py --replace "'pytest-runner'" ""

     

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         meta = with lib; {

+2 -2

pkgs/development/python-modules/Nikola/default.nix

···

       30
       30
        
       buildPythonPackage rec {

     

       31
       31
        
         name = "${pname}-${version}";

     

       32
       32
        
         pname = "Nikola";

     

       33
       33
       -
         version = "7.8.10";

     

       33
       33
       +
         version = "7.8.11";

     

       34
       34
        
       

     

       35
       35
        
         # Nix contains only Python 3 supported version of doit, which is a dependency

     

       36
       36
        
         # of Nikola. Python 2 support would require older doit 0.29.0 (which on the

     
···

       47
       47
        
       

     

       48
       48
        
         src = fetchPypi {

     

       49
       49
        
           inherit pname version;

     

       50
       50
       -
           sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537";

     

       50
       50
       +
           sha256 = "10d95b3af84e61496ef729665eafa2235fd0fd4cc6c57644dd0f2c19a968dd0f";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         meta = {

+2 -2

pkgs/development/python-modules/Theano/default.nix

···

       35
       35
        
       in buildPythonPackage rec {

     

       36
       36
        
         name = "${pname}-${version}";

     

       37
       37
        
         pname = "Theano";

     

       38
       38
       -
         version = "0.9.0";

     

       38
       38
       +
         version = "1.0.1";

     

       39
       39
        
       

     

       40
       40
        
         disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");

     

       41
       41
        
       

     

       42
       42
        
         src = fetchPypi {

     

       43
       43
        
           inherit pname version;

     

       44
       44
       -
           sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl";

     

       44
       44
       +
           sha256 = "88d8aba1fe2b6b75eacf455d01bc7e31e838c5a0fb8c13dde2d9472495ff4662";

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/absl-py/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "absl-py";

     

       9
       9
       -
         version = "0.1.5";

     

       9
       9
       +
         version = "0.1.7";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "94943ed0cd77077fe2d18e79b2f28d3e92f585f7d1c6edc75e640121f3c5d580";

     

       14
       14
       +
           sha256 = "4ea22ae860f3a556511291e7f1284942199c81377f47ec4248163defb1b9e6ee";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = [ six ];

+2 -2

pkgs/development/python-modules/aenum/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "aenum";

     

       5
       5
       -
         version = "2.0.8";

     

       5
       5
       +
         version = "2.0.9";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "3209fa41b8c41345442e8d9b5158a57d3e96d84c3d5ebbe8e521e1e2eff1598d";

     

       10
       10
       +
           sha256 = "d98bc55136d696fcf323760c3db0de489da9e41fd51283fa6f90205deb85bf6a";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         doCheck = !isPy3k;

+2 -2

pkgs/development/python-modules/aiohttp/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "aiohttp";

     

       16
       16
       -
         version = "2.3.3";

     

       16
       16
       +
         version = "2.3.7";

     

       17
       17
        
         name = "${pname}-${version}";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "0a2e33e90560dacb819b095b9d9611597925d75d1b93dd9490055d3826d98a82";

     

       21
       21
       +
           sha256 = "fe294df38e9c67374263d783a7a29c79372030f5962bd5734fa51c6f4bbfee3b";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.4";

+5 -6

pkgs/development/python-modules/arrow/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , nose, chai, simplejson

     

       2
       2
       +
       , nose, chai, simplejson, backports_functools_lru_cache

     

       3
       3
        
       , dateutil }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
       -
         name = "${pname}-${version}";

     

       7
       6
        
         pname = "arrow";

     

       8
       8
       -
         version = "0.10.0";

     

       7
       7
       +
         version = "0.12.0";

     

       9
       8
        
       

     

       10
       9
        
         src = fetchPypi {

     

       11
       10
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0";

     

       11
       11
       +
           sha256 = "a15ecfddf334316e3ac8695e48c15d1be0d6038603b33043930dcf0e675c86ee";

     

       13
       12
        
         };

     

       14
       13
        
       

     

       15
       14
        
         checkPhase = ''

     

       16
       15
        
           nosetests --cover-package=arrow

     

       17
       16
        
         '';

     

       18
       17
        
       

     

       19
       19
       -
         buildInputs = [ nose chai simplejson ];

     

       20
       20
       -
         propagatedBuildInputs = [ dateutil ];

     

       18
       18
       +
         checkInputs = [ nose chai simplejson ];

     

       19
       19
       +
         propagatedBuildInputs = [ dateutil backports_functools_lru_cache ];

     

       21
       20
        
       

     

       22
       21
        
         meta = with stdenv.lib; {

     

       23
       22
        
           description = "Python library for date manipulation";

+2 -2

pkgs/development/python-modules/asgiref/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchurl, six }:

     

       2
       2
        
       buildPythonPackage rec {

     

       3
       3
       -
         version = "1.1.2";

     

       3
       3
       +
         version = "2.0.1";

     

       4
       4
        
         pname = "asgiref";

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://pypi/a/asgiref/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c";

     

       9
       9
       +
           sha256 = "c3d70c473a2b7e525e18e68504630943e107f5b32f440c00c8543f94f565c855";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ six ];

+2 -2

pkgs/development/python-modules/asn1crypto/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "asn1crypto";

     

       8
       8
       -
         version = "0.23.0";

     

       8
       8
       +
         version = "0.24.0";

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70";

     

       13
       13
       +
           sha256 = "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # No tests included

+2 -2

pkgs/development/python-modules/astor/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "astor";

     

       5
       5
       -
         version = "0.5";

     

       5
       5
       +
         version = "0.6.2";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa";

     

       10
       10
       +
           sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/python-modules/astroid/default.nix

···

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
         pname = "astroid";

     

       9
       9
       -
         version = "1.5.3";

     

       9
       9
       +
         version = "1.6.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35";

     

       13
       13
       +
           sha256 = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]

+2 -2

pkgs/development/python-modules/astropy/default.nix

···

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         

     

       9
       9
        
         pname = "astropy";

     

       10
       10
       -
         version = "2.0.2";

     

       10
       10
       +
         version = "2.0.3";

     

       11
       11
        
       

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
        
         doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d";

     

       16
       16
       +
           sha256 = "fdfc0248f6250798ed6d1327be609cb901db89ae01fc768cfbc9e263bdf56f4f";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires

+6 -4

pkgs/development/python-modules/attrs/default.nix

···

       2
       2
        
       , pympler, coverage, six, clang }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
       -
         name = "${pname}-${version}";

     

       6
       5
        
         pname = "attrs";

     

       7
       7
       -
         version = "17.2.0";

     

       6
       6
       +
         version = "17.4.0";

     

       8
       7
        
       

     

       9
       8
        
         src = fetchPypi {

     

       10
       9
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "04gx08ikpk26wnq22f7l42gapcvk8iz1512r927k6sadz6cinkax";

     

       10
       10
       +
           sha256 = "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9";

     

       12
       11
        
         };

     

       13
       12
        
       

     

       14
       13
        
         # macOS needs clang for testing

     

       15
       15
       -
         buildInputs = [

     

       14
       14
       +
         checkInputs = [

     

       16
       15
        
           pytest hypothesis zope_interface pympler coverage six

     

       17
       16
        
         ] ++ lib.optionals (stdenv.isDarwin) [ clang ];

     

       18
       17
        
       

     

       19
       18
        
         checkPhase = ''

     

       20
       19
        
           py.test

     

       21
       20
        
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         # To prevent infinite recursion with pytest

     

       23
       23
       +
         doCheck = false;

     

       22
       24
        
       

     

       23
       25
        
         meta = with lib; {

     

       24
       26
        
           description = "Python attributes without boilerplate";

+29

pkgs/development/python-modules/aws-xray-sdk/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , jsonpickle

     

       5
       5
       +
       , wrapt

     

       6
       6
       +
       , requests

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "aws-xray-sdk";

     

       11
       11
       +
         version = "0.95";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           sha256 = "9e7ba8dd08fd2939376c21423376206bff01d0deaea7d7721c6b35921fed1943";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = [

     

       19
       19
       +
           jsonpickle wrapt requests

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           description = "AWS X-Ray SDK for the Python programming language";

     

       24
       24
       +
           license = lib.licenses.asl20;

     

       25
       25
       +
           homepage = https://github.com/aws/aws-xray-sdk-python;

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         doCheck = false;

     

       29
       29
       +
       }

+25

pkgs/development/python-modules/backports_abc/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , python

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "backports_abc";

     

       9
       9
       +
         version = "0.5";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         checkPhase = ''

     

       17
       17
       +
           ${python.interpreter} -m unittest discover

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         meta = {

     

       21
       21
       +
           homepage = https://github.com/cython/backports_abc;

     

       22
       22
       +
           license = lib.licenses.psfl;

     

       23
       23
       +
           description = "A backport of recent additions to the 'collections.abc' module";

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+24

pkgs/development/python-modules/backports_functools_lru_cache/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , setuptools_scm

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "backports.functools_lru_cache";

     

       9
       9
       +
         version = "1.4";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ setuptools_scm ];

     

       17
       17
       +
         doCheck = false; # No proper test

     

       18
       18
       +
       

     

       19
       19
       +
         meta = {

     

       20
       20
       +
           description = "Backport of functools.lru_cache";

     

       21
       21
       +
           homepage = https://github.com/jaraco/backports.functools_lru_cache;

     

       22
       22
       +
           license = lib.licenses.mit;

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+32

pkgs/development/python-modules/backports_lzma/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , isPy3k

     

       5
       5
       +
       , lzma

     

       6
       6
       +
       , python

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "backports.lzma";

     

       11
       11
       +
         version = "0.0.8";

     

       12
       12
       +
       

     

       13
       13
       +
         disabled = isPy3k;

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchPypi {

     

       16
       16
       +
           inherit pname version;

     

       17
       17
       +
           sha256 = "200584ad5079d8ca6b1bfe14890c7be58666ab0128d8ca26cfb2669b476085f3";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         buildInputs = [ lzma ];

     

       21
       21
       +
       

     

       22
       22
       +
         # Needs the compiled module in $out

     

       23
       23
       +
         checkPhase = ''

     

       24
       24
       +
           PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -m unittest discover -s test

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         meta = {

     

       28
       28
       +
           description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files";

     

       29
       29
       +
           homepage = https://github.com/peterjc/backports.lzma;

     

       30
       30
       +
           license = lib.licenses.bsd3;

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+32

pkgs/development/python-modules/biopython/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , numpy

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "biopython";

     

       9
       9
       +
         version = "1.70";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "4a7c5298f03d1a45523f32bae1fffcff323ea9dce007fb1241af092f5ab2e45b";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         propagatedBuildInputs = [ numpy ];

     

       17
       17
       +
         # Checks try to write to $HOME, which does not work with nix

     

       18
       18
       +
         doCheck = false;

     

       19
       19
       +
         meta = {

     

       20
       20
       +
           description = "Python library for bioinformatics";

     

       21
       21
       +
           longDescription = ''

     

       22
       22
       +
             Biopython is a set of freely available tools for biological computation

     

       23
       23
       +
             written in Python by an international team of developers. It is a

     

       24
       24
       +
             distributed collaborative effort to develop Python libraries and

     

       25
       25
       +
             applications which address the needs of current and future work in

     

       26
       26
       +
             bioinformatics.

     

       27
       27
       +
           '';

     

       28
       28
       +
           homepage = http://biopython.org/wiki/Documentation;

     

       29
       29
       +
           maintainers = with lib.maintainers; [ luispedro ];

     

       30
       30
       +
           license = lib.licenses.bsd3;

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+3 -9

pkgs/development/python-modules/blaze/default.nix

···

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     

       27
       27
        
         pname = "blaze";

     

       28
       28
       -
         version = "0.11.0";

     

       29
       29
       -
         name = "${pname}-${version}";

     

       28
       28
       +
         version = "0.11.3";

     

       30
       29
        
       

     

       31
       30
        
         src = fetchurl {

     

       32
       31
        
           url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";

     

       33
       33
       -
           sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a";

     

       32
       32
       +
           sha256 = "075gqc9d7g284z4nfwv5zbq99ln22w25l4lcndjg3v10kmsjadww";

     

       34
       33
        
         };

     

       35
       34
        
       

     

       36
       35
        
         checkInputs = [ pytest ];

     
···

       56
       55
        
           toolz

     

       57
       56
        
         ];

     

       58
       57
        
       

     

       59
       59
       -
         # Failing test

     

       60
       60
       -
         # ERROR collecting blaze/tests/test_interactive.py

     

       61
       61
       -
         # E   networkx.exception.NetworkXNoPath: node <class 'list'> not

     

       62
       62
       -
         # reachable from <class 'dask.array.core.Array'>

     

       63
       63
       -
         doCheck = false;

     

       64
       64
       -
       

     

       65
       58
        
         checkPhase = ''

     

       59
       59
       +
           rm pytest.ini # Not interested in coverage

     

       66
       60
        
           py.test blaze/tests

     

       67
       61
        
         '';

     

       68
       62

+2 -2

pkgs/development/python-modules/bokeh/default.nix

···

       34
       34
        
       buildPythonPackage rec {

     

       35
       35
        
         pname = "bokeh";

     

       36
       36
        
         name = "${pname}${version}";

     

       37
       37
       -
         version = "0.12.10";

     

       37
       37
       +
         version = "0.12.13";

     

       38
       38
        
       

     

       39
       39
        
         src = fetchPypi {

     

       40
       40
        
           inherit pname version;

     

       41
       41
       -
           sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393";

     

       41
       41
       +
           sha256 = "6e28cbfd88de0c459435278b75f9982591ec0aaa3d37a195052645e1c62e89e3";

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         disabled = isPyPy;

+2 -2

pkgs/development/python-modules/bootstrapped-pip/default.nix

···

       9
       9
        
         };

     

       10
       10
        
         setuptools_source = fetchPypi {

     

       11
       11
        
           pname = "setuptools";

     

       12
       12
       -
           version = "38.2.3";

     

       12
       12
       +
           version = "38.2.5";

     

       13
       13
        
           format = "wheel";

     

       14
       14
       -
           sha256 = "0c4j3jiiwc0h1bdv4xklinp90spgvgiv5fsxp119hif9934nfxfs";

     

       14
       14
       +
           sha256 = "bcf0d4f3e2f7890e658db11e218b8643afffb905a0e2f2a7d5a6a3e949bb87e6";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         # TODO: Shouldn't be necessary anymore for pip > 9.0.1!

+50

pkgs/development/python-modules/boto3/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , botocore

     

       5
       5
       +
       , jmespath

     

       6
       6
       +
       , s3transfer

     

       7
       7
       +
       , futures

     

       8
       8
       +
       , docutils

     

       9
       9
       +
       , nose

     

       10
       10
       +
       , mock

     

       11
       11
       +
       , isPy3k

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         pname =  "boto3";

     

       16
       16
       +
         version = "1.4.8";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "boto";

     

       20
       20
       +
           repo  = "boto3";

     

       21
       21
       +
           rev   = version;

     

       22
       22
       +
           sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

     

       26
       26
       +
         checkInputs = [ docutils nose mock ];

     

       27
       27
       +
       

     

       28
       28
       +
         checkPhase = ''

     

       29
       29
       +
           runHook preCheck

     

       30
       30
       +
           # This method is not in mock. It might have appeared in some versions.

     

       31
       31
       +
           sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \

     

       32
       32
       +
             tests/unit/resources/test_factory.py

     

       33
       33
       +
           nosetests -d tests/unit --verbose

     

       34
       34
       +
           runHook postCheck

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         # Network access

     

       38
       38
       +
         doCheck = false;

     

       39
       39
       +
       

     

       40
       40
       +
         meta = {

     

       41
       41
       +
           homepage = https://github.com/boto/boto3;

     

       42
       42
       +
           license = lib.licenses.asl20;

     

       43
       43
       +
           description = "AWS SDK for Python";

     

       44
       44
       +
           longDescription = ''

     

       45
       45
       +
             Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for

     

       46
       46
       +
             Python, which allows Python developers to write software that makes use of

     

       47
       47
       +
             services like Amazon S3 and Amazon EC2.

     

       48
       48
       +
           '';

     

       49
       49
       +
         };

     

       50
       50
       +
       }

+2 -2

pkgs/development/python-modules/botocore/default.nix

···

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
        
         pname = "botocore";

     

       15
       15
       -
         version = "1.8.10";

     

       15
       15
       +
         version = "1.8.21";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "16dznd0mxxs8imsl228vx5s9bz9v7ggajs496jy21n5a19cadkch";

     

       19
       19
       +
           sha256 = "e4513a02f68e7efd7494ee56db201d87620218ca879aae361abbb71bcde3aa5f";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+36

pkgs/development/python-modules/brotlipy/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , cffi

     

       5
       5
       +
       , enum34

     

       6
       6
       +
       , construct

     

       7
       7
       +
       , pytest

     

       8
       8
       +
       , hypothesis

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "brotlipy";

     

       13
       13
       +
         version = "0.7.0";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchPypi {

     

       16
       16
       +
           inherit pname version;

     

       17
       17
       +
           sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         propagatedBuildInputs = [ cffi enum34 construct ];

     

       21
       21
       +
       

     

       22
       22
       +
         checkInputs = [ pytest hypothesis ];

     

       23
       23
       +
       

     

       24
       24
       +
         checkPhase = ''

     

       25
       25
       +
           py.test

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         # Missing test files

     

       29
       29
       +
         doCheck = false;

     

       30
       30
       +
       

     

       31
       31
       +
         meta = {

     

       32
       32
       +
           description = "Python bindings for the reference Brotli encoder/decoder";

     

       33
       33
       +
           homepage = "https://github.com/python-hyper/brotlipy/";

     

       34
       34
       +
           license = lib.licenses.mit;

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+25

pkgs/development/python-modules/cached-property/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , freezegun

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "cached-property";

     

       9
       9
       +
         version = "1.3.1";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "6562f0be134957547421dda11640e8cadfa7c23238fc4e0821ab69efdb1095f3";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [ freezegun ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = {

     

       19
       19
       +
           description = "A decorator for caching properties in classes";

     

       20
       20
       +
           homepage = https://github.com/pydanny/cached-property;

     

       21
       21
       +
           license = lib.licenses.bsd3;

     

       22
       22
       +
           platforms = lib.platforms.unix;

     

       23
       23
       +
           maintainers = with lib.maintainers; [ ericsagnes ];

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2 -2

pkgs/development/python-modules/credstash/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname    = "credstash";

     

       5
       5
       -
         version = "1.13.4";

     

       5
       5
       +
         version = "1.14.0";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81";

     

       10
       10
       +
           sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];

+2 -2

pkgs/development/python-modules/csscompressor/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi }:

     

       2
       2
        
       buildPythonPackage rec {

     

       3
       3
        
         pname = "csscompressor";

     

       4
       4
       -
         version = "0.9.4";

     

       4
       4
       +
         version = "0.9.5";

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0e12f125b88379d7b680636d94a3c8fa14bed1de2358f7f9a9e6749e222cff3b";

     

       9
       9
       +
           sha256 = "afa22badbcf3120a4f392e4d22f9fff485c044a1feda4a950ecc5eba9dd31a05";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         doCheck = false; # No tests

+2 -2

pkgs/development/python-modules/cx_freeze/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "cx_Freeze";

     

       5
       5
       -
         version = "5.0.2";

     

       5
       5
       +
         version = "5.1.1";

     

       6
       6
        
         name  = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0zbx9j5z5l06bvwvlqvvn7h9dm7zjcjgxm7agbb625nymkq6cd15";

     

       10
       10
       +
           sha256 = "2eadddde670f5c5f6cf88638a0ac4e5d5fe181292a31063275fa56c7bf22426b";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ ncurses ];

+2 -2

pkgs/development/python-modules/cytoolz/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "cytoolz";

     

       12
       12
       -
         version = "0.8.2";

     

       12
       12
       +
         version = "0.9.0";

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552";

     

       17
       17
       +
           sha256 = "5ebb55855a8bb7800afa58e52408763935527e0305f35600c71b43c86013dec2";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         # Extension types

+2 -2

pkgs/development/python-modules/dask/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "dask";

     

       15
       15
       -
         version = "0.15.4";

     

       15
       15
       +
         version = "0.16.0";

     

       16
       16
        
         name = "${pname}-${version}";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea";

     

       20
       20
       +
           sha256 = "40d150b73e3366c9521e9dde206046a66906330074f87be901b1e1013ce6cb73";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [ pytest ];

+20

pkgs/development/python-modules/decorator/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "decorator";

     

       8
       8
       +
         version = "4.1.2";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "7cb64d38cb8002971710c8899fbdfb859a23a364b7c99dab19d1f719c2ba16b5";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         meta = {

     

       16
       16
       +
           homepage = https://pypi.python.org/pypi/decorator;

     

       17
       17
       +
           description = "Better living through Python with decorators";

     

       18
       18
       +
           license = lib.licenses.mit;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+2 -2

pkgs/development/python-modules/distro/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         name = "${pname}-${version}";

     

       5
       5
        
         pname = "distro";

     

       6
       6
       -
         version = "1.0.4";

     

       6
       6
       +
         version = "1.2.0";

     

       7
       7
        
       

     

       8
       8
        
         buildInputs = [ pytest pytestcov tox];

     

       9
       9
        
       

     
···

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954";

     

       17
       17
       +
           sha256 = "d94370e43b676ac44fbe1ab68ca903a6147eaba3a9e8eff85b2c05556a455b76";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/python-modules/django-jinja2/default.nix

···

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "django-jinja";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
       -
         version = "2.2.2";

     

       8
       8
       +
         version = "2.4.1";

     

       9
       9
        
       

     

       10
       10
        
         meta = {

     

       11
       11
        
           description = "Simple and nonobstructive jinja2 integration with Django";

     
···

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "099b99iprkvlsndrjmw4v3i3i60i9gm1aq5r88z15r7vgmv6sigj";

     

       18
       18
       +
           sha256 = "8a49d73de616a12075eee14c6d3bbab936261a463457d40348d8b8e2995cfbed";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ django pytz tox ];

+2 -2

pkgs/development/python-modules/djangorestframework/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchurl, django }:

     

       2
       2
        
       buildPythonPackage rec {

     

       3
       3
       -
         version = "3.7.3";

     

       3
       3
       +
         version = "3.7.7";

     

       4
       4
        
         pname = "djangorestframework";

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "067960e5e9e5586d3b2d53a1d626c4800dc33cd8309487d404fc63355674556f";

     

       9
       9
       +
           sha256 = "9f9e94e8d22b100ed3a43cee8c47a7ff7b185e778a1f2da9ec5c73fc4e081b87";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # Test settings are missing

+2 -2

pkgs/development/python-modules/docker/default.nix

···

       3
       3
        
       , ipaddress, backports_ssl_match_hostname, docker_pycreds

     

       4
       4
        
       }:

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
       -
         version = "2.5.1";

     

       6
       6
       +
         version = "2.7.0";

     

       7
       7
        
         pname = "docker";

     

       8
       8
        
         name = "${pname}-${version}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://pypi/d/docker/${name}.tar.gz";

     

       12
       12
       -
           sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880";

     

       12
       12
       +
           sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = [

+5 -6

pkgs/development/python-modules/docker_compose/default.nix

···

       3
       3
        
       , pyyaml, backports_ssl_match_hostname, colorama, docopt

     

       4
       4
        
       , dockerpty, docker, ipaddress, jsonschema, requests

     

       5
       5
        
       , six, texttable, websocket_client, cached-property

     

       6
       6
       -
       , enum34, functools32

     

       6
       6
       +
       , enum34, functools32,

     

       7
       7
        
       }:

     

       8
       8
        
       buildPythonApplication rec {

     

       9
       9
       -
         version = "1.15.0";

     

       9
       9
       +
         version = "1.18.0";

     

       10
       10
        
         pname = "docker-compose";

     

       11
       11
       -
         name = "${pname}-${version}";

     

       12
       11
        
       

     

       13
       12
        
         src = fetchPypi {

     

       14
       13
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg";

     

       14
       14
       +
           sha256 = "2930cbfe2685018fbb75377600ab6288861d9955717b3f14212f63950351d379";

     

       16
       15
        
         };

     

       17
       16
        
       

     

       18
       17
        
         # lots of networking and other fails

     

       19
       18
        
         doCheck = false;

     

       20
       20
       -
         buildInputs = [ mock pytest nose ];

     

       19
       19
       +
         checkInputs = [ mock pytest nose ];

     

       21
       20
        
         propagatedBuildInputs = [

     

       22
       21
        
           pyyaml backports_ssl_match_hostname colorama dockerpty docker

     

       23
       22
        
           ipaddress jsonschema requests six texttable websocket_client

     
···

       26
       25
        
           stdenv.lib.optional (pythonOlder "3.4") enum34 ++

     

       27
       26
        
           stdenv.lib.optional (pythonOlder "3.2") functools32;

     

       28
       27
        
       

     

       29
       29
       -
         patchPhase = ''

     

       28
       28
       +
         postPatch = ''

     

       30
       29
        
           # Remove upper bound on requires, see also

     

       31
       30
        
           # https://github.com/docker/compose/issues/4431

     

       32
       31
        
           sed -i "s/, < .*',$/',/" setup.py

+2 -2

pkgs/development/python-modules/easy-thumbnails/default.nix

···

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "easy-thumbnails";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
       -
         version = "2.4.2";

     

       8
       8
       +
         version = "2.5";

     

       9
       9
        
       

     

       10
       10
        
         meta = {

     

       11
       11
        
           description = "Easy thumbnails for Django";

     
···

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "8cad7ea4fb2b800284e842d8a44f685cbc1968535be04c24a4bbf6e6dbc550c4";

     

       18
       18
       +
           sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ django pillow ];

+2 -2

pkgs/development/python-modules/eve/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "Eve";

     

       6
       6
       -
         version = "0.7.4";

     

       6
       6
       +
         version = "0.7.5";

     

       7
       7
        
         name  = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "0xihl5w2m4vkp0515qjibiy88pk380n5jmj8n9hh7q40b1vx1kwb";

     

       11
       11
       +
           sha256 = "dd4ffbc4725220ffdc8e32f8566c8870efaecdc238d0f96b18e1e83227eca55d";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches = [

+23

pkgs/development/python-modules/extras/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "extras";

     

       8
       8
       +
         version = "1.0.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         # error: invalid command 'test'

     

       16
       16
       +
         doCheck = false;

     

       17
       17
       +
       

     

       18
       18
       +
         meta = {

     

       19
       19
       +
           description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges";

     

       20
       20
       +
           homepage = https://code.google.com/p/mimeparse/;

     

       21
       21
       +
           license = lib.licenses.mit;

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -2

pkgs/development/python-modules/faker/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "Faker";

     

       11
       11
       -
         version = "0.8.7";

     

       11
       11
       +
         version = "0.8.8";

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "bf7dabcd6807c8829da28a4de491adf7998af506b8571db6a6eb58161157248a";

     

       16
       16
       +
           sha256 = "e928cf853ef69d7471421f2a3716a1239e43de0fa9855f4016ee0c9f1057328a";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         checkInputs = [

+4 -4

pkgs/development/python-modules/fastimport/default.nix

···

       1
       1
       -
       { stdenv, buildPythonPackage, python, fetchurl }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, python, fetchPypi}:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         name = "fastimport-${version}";

     

       4
       4
       +
         pname = "fastimport";

     

       5
       5
        
         version = "0.9.6";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://pypi/f/fastimport/${name}.tar.gz";

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           inherit pname version;

     

       9
       9
        
           sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43";

     

       10
       10
        
         };

     

       11
       11

+2 -2

pkgs/development/python-modules/faulthandler/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         name = "${pname}-${version}";

     

       5
       5
        
         pname = "faulthandler";

     

       6
       6
       -
         version = "2.6";

     

       6
       6
       +
         version = "3.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r";

     

       10
       10
       +
           sha256 = "acc10e10909f0f956ba1b42b6c450ea0bdaaa27b3942899f65931396cfcdd36a";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         meta = {

+2 -2

pkgs/development/python-modules/filelock/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "filelock";

     

       5
       5
       -
         version = "2.0.13";

     

       5
       5
       +
         version = "2.0.14";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "1n67dw7np5gsy5whynyk8c46pjlr353d6j9735p5gryaszkpjl6h";

     

       9
       9
       +
           sha256 = "ee355eb66e4c2e5d95689e1253515aad5b3177c274abdd00a57d5ab1aa6d071a";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/python-modules/fiona/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "Fiona";

     

       8
       8
       -
         version = "1.7.10.post1";

     

       8
       8
       +
         version = "1.7.11";

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8";

     

       13
       13
       +
           sha256 = "5e9c68ea71e9d79fcfb68c9a101c0b133301e233c9bcca7b7c65f33cc7636ef5";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [

+2 -2

pkgs/development/python-modules/flake8-debugger/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "flake8-debugger";

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
       -
         version = "1.4.0";

     

       6
       6
       +
         version = "3.0.0";

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "0chjfa6wvnqjnx778qzahhwvjx1j0rc8ax0ipp5bn70gf47lj62r";

     

       9
       9
       +
           sha256 = "e5c8ac980d819db2f3fbb89fe0e43a2fe6c127edd6ce4984a3f7e0bbdac3d2d4";

     

       10
       10
        
         };

     

       11
       11
        
         buildInputs = [ nose ];

     

       12
       12
        
         propagatedBuildInputs = [ flake8 ];

+2 -2

pkgs/development/python-modules/flask-testing/default.nix

···

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
         pname = "Flask-Testing";

     

       9
       9
       -
         version = "0.6.2";

     

       9
       9
       +
         version = "0.7.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "1w0dpwvrcpffm8ychyxpm8s5blm7slik9kplh9jb3sgwcv9gyppj";

     

       13
       13
       +
           sha256 = "dc076623d7d850653a018cb64f500948334c8aeb6b10a5a842bf1bcfb98122bc";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         postPatch = ''

+6 -8

pkgs/development/python-modules/flit/default.nix

···

       11
       11
        
       , pytest

     

       12
       12
        
       , testpath

     

       13
       13
        
       , responses

     

       14
       14
       +
       , pytoml

     

       14
       15
        
       }:

     

       15
       16
        
       

     

       16
       17
        
       # Flit is actually an application to build universal wheels.

     
···

       20
       21
        
       

     

       21
       22
        
       buildPythonPackage rec {

     

       22
       23
        
         pname = "flit";

     

       23
       23
       -
         version = "0.11.4";

     

       24
       24
       -
         name = "${pname}-${version}";

     

       25
       25
       -
       

     

       26
       26
       -
       #   format = "wheel";

     

       24
       24
       +
         version = "0.13";

     

       27
       25
        
       

     

       28
       26
        
         src = fetchPypi {

     

       29
       27
        
           inherit pname version;

     

       30
       30
       -
       #     url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl;

     

       31
       31
       -
           sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb";

     

       28
       28
       +
           sha256 = "8f558351bf4bb82b872d3bdbea7055cbb2e33ed2bdf809284bf927d4c78bf0ee";

     

       32
       29
        
         };

     

       33
       30
        
       

     

       34
       31
        
         disabled = !isPy3k;

     

       35
       35
       -
         propagatedBuildInputs = [ docutils requests requests_download ] ++ lib.optional (pythonOlder "3.6") zipfile36;

     

       32
       32
       +
         propagatedBuildInputs = [ docutils requests requests_download pytoml ] ++ lib.optional (pythonOlder "3.6") zipfile36;

     

       36
       33
        
       

     

       37
       34
        
         checkInputs = [ pytest testpath responses ];

     

       38
       35
        
       

     

       39
       36
        
         # Disable test that needs some ini file.

     

       37
       37
       +
         # Disable test that wants hg

     

       40
       38
        
         checkPhase = ''

     

       41
       41
       -
           py.test -k "not test_invalid_classifier"

     

       39
       39
       +
           py.test -k "not test_invalid_classifier and not test_build_sdist"

     

       42
       40
        
         '';

     

       43
       41
        
       

     

       44
       42
        
         meta = {

+2 -2

pkgs/development/python-modules/fonttools/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "fonttools";

     

       10
       10
       -
         version = "3.17.0";

     

       10
       10
       +
         version = "3.21.0";

     

       11
       11
        
         name = "${pname}-${version}";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24";

     

       15
       15
       +
           sha256 = "95b5c66d19dbffd57be1636d1f737c7644d280a48c28f933aeb4db73a7c83495";

     

       16
       16
        
           extension = "zip";

     

       17
       17
        
         };

     

       18
       18

+2 -2

pkgs/development/python-modules/ftfy/default.nix

···

       11
       11
        
         name = "${pname}-${version}";

     

       12
       12
        
         pname = "ftfy";

     

       13
       13
        
         # latest is 5.1.1, buy spaCy requires 4.4.3

     

       14
       14
       -
         version = "5.1.1";

     

       14
       14
       +
         version = "5.2.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78";

     

       18
       18
       +
           sha256 = "b9f84a1437f68ad0bb964fd9da9f6b88d090113ec9e78f290f6d6d0221468e38";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ html5lib wcwidth];

+2 -2

pkgs/development/python-modules/gensim/default.nix

···

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "gensim";

     

       15
       15
        
         name = "${pname}-${version}";

     

       16
       16
       -
         version = "3.0.1";

     

       16
       16
       +
         version = "3.2.0";

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650";

     

       19
       19
       +
           sha256 = "db00b68c6567ba0598d400b917c889e8801adf249170ce0a80ec38187d1b0797";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [ smart_open numpy six scipy

+3 -5

pkgs/development/python-modules/gflags/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         version = "3.1.2";

     

       5
       5
       -
         pname = "gflags";

     

       6
       6
       -
         name = pname + "-" + version;

     

       5
       5
       +
         pname = "python-gflags";

     

       7
       6
        
       

     

       8
       7
        
         src = fetchPypi {

     

       9
       9
       -
           inherit version;

     

       10
       10
       -
           pname = "python-gflags";

     

       8
       8
       +
           inherit pname version;

     

       11
       9
        
           sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2";

     

       12
       10
        
         };

     

       13
       11
        
       

     

       14
       14
       -
         buildInputs = [ pytest ];

     

       12
       12
       +
         checkInputs = [ pytest ];

     

       15
       13
        
       

     

       16
       14
        
         propagatedBuildInputs = [ six ];

     

       17
       15

+2 -2

pkgs/development/python-modules/google_api_core/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "google-api-core";

     

       6
       6
       -
         version = "0.1.2";

     

       6
       6
       +
         version = "0.1.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0qmjswj079w7q7zbnh8p4n2r3f831wymm9hfdlc7zfrini7184xv";

     

       10
       10
       +
           sha256 = "03bc4b1ab69c0e113af07e706edee50f583abe8219fe1e1d529dee191cb8e0bf";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ];

+2 -2

pkgs/development/python-modules/gpy/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "GPy";

     

       6
       6
       -
         version = "1.8.4";

     

       6
       6
       +
         version = "1.8.5";

     

       7
       7
        
         name  = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1";

     

       11
       11
       +
           sha256 = "1562e34629192f209273f454e41614a127c6ef04144cd0eb5992d484721d55d3";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # running tests produces "ImportError: cannot import name 'linalg_cython'"

+2 -2

pkgs/development/python-modules/grpcio/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "grpcio";

     

       6
       6
       -
         version = "1.7.3";

     

       6
       6
       +
         version = "1.8.2";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "1wkrxj1jmf2dyx207fc9ysyns9h27gls3drgg05mzdckjqr5lnl6";

     

       10
       10
       +
           sha256 = "1ea1336f0d1158c4e00e96a94df84b75f6bbff9816abb6cc68cbdc9442a9ac55";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ six protobuf ]

+2 -2

pkgs/development/python-modules/gssapi/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "gssapi";

     

       6
       6
       -
         version = "1.2.0";

     

       6
       6
       +
         version = "1.3.0";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "1q6ccpz6anl9vggwxdq32wp6xjh2lyfbf7av6jqnmvmyqdfwh3b9";

     

       11
       11
       +
           sha256 = "765205082a9490c8e8be88ac16a6249d124396a671665edeec9927a7f244d712";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # It's used to locate headers

+42

pkgs/development/python-modules/html5lib/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , flake8

     

       5
       5
       +
       , pytest

     

       6
       6
       +
       , pytest-expect

     

       7
       7
       +
       , mock

     

       8
       8
       +
       , six

     

       9
       9
       +
       , webencodings

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "html5lib";

     

       14
       14
       +
         version = "1.0.1";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchPypi {

     

       17
       17
       +
           inherit pname version;

     

       18
       18
       +
           sha256 = "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         checkInputs = [ flake8 pytest pytest-expect mock ];

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           six webencodings

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         checkPhase = ''

     

       27
       27
       +
           py.test

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         meta = {

     

       31
       31
       +
           homepage = https://github.com/html5lib/html5lib-python;

     

       32
       32
       +
           downloadPage = https://github.com/html5lib/html5lib-python/releases;

     

       33
       33
       +
           description = "HTML parser based on WHAT-WG HTML5 specification";

     

       34
       34
       +
           longDescription = ''

     

       35
       35
       +
             html5lib is a pure-python library for parsing HTML. It is designed to

     

       36
       36
       +
             conform to the WHATWG HTML specification, as is implemented by all

     

       37
       37
       +
             major web browsers.

     

       38
       38
       +
           '';

     

       39
       39
       +
           license = lib.licenses.mit;

     

       40
       40
       +
           maintainers = with lib.maintainers; [ domenkozar prikhi ];

     

       41
       41
       +
         };

     

       42
       42
       +
       }

+2 -2

pkgs/development/python-modules/htmlmin/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi }:

     

       2
       2
        
       buildPythonPackage rec {

     

       3
       3
        
         pname = "htmlmin";

     

       4
       4
       -
         version = "0.1.11";

     

       4
       4
       +
         version = "0.1.12";

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
        
         src = fetchPypi {

     

       7
       7
        
           inherit pname version;

     

       8
       8
       -
           sha256 = "f27fb96fdddeb1725ee077be532c7bea23288c69d0e996e7798f24fae7a14e5e";

     

       8
       8
       +
           sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         # Tests run fine in a normal source checkout, but not when being built by nix.

+2 -2

pkgs/development/python-modules/httpbin/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "httpbin";

     

       13
       13
       -
         version = "0.5.0";

     

       13
       13
       +
         version = "0.6.2";

     

       14
       14
        
         name = "${pname}-${version}";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054";

     

       18
       18
       +
           sha256 = "0afa0486a76305cac441b5cc80d5d4ccd82b20875da7c5119ecfe616cefef45f";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ];

+20

pkgs/development/python-modules/idna/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "idna";

     

       8
       8
       +
         version = "2.6";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         meta = {

     

       16
       16
       +
           homepage = "http://github.com/kjd/idna/";

     

       17
       17
       +
           description = "Internationalized Domain Names in Applications (IDNA)";

     

       18
       18
       +
           license = lib.licenses.bsd3;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+2 -2

pkgs/development/python-modules/ipykernel/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "ipykernel";

     

       16
       16
       -
         version = "4.6.1";

     

       16
       16
       +
         version = "4.7.0";

     

       17
       17
        
         name = "${pname}-${version}";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db";

     

       21
       21
       +
           sha256 = "354986612a38f0555c43d5af2425e2a67506b63b313a0325e38904003b9d977b";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [ nose ] ++ lib.optional isPy27 mock;

+2 -2

pkgs/development/python-modules/ipywidgets/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "ipywidgets";

     

       17
       17
       -
         version = "7.0.5";

     

       17
       17
       +
         version = "7.1.0";

     

       18
       18
        
         name = "${pname}-${version}";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "321be3dc48193130ba16e8080172bb5cd052eb65e3ad0ea7b5f80ff73e24bc54";

     

       22
       22
       +
           sha256 = "3e2be7dea4f97c9a4df71ef065cad9f2e420dd901127bf7cb690fb56d2b34ea3";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         # Tests are not distributed

+27

pkgs/development/python-modules/iso8601/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytest

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "iso8601";

     

       9
       9
       +
         version = "0.1.12";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [ pytest ];

     

       17
       17
       +
       

     

       18
       18
       +
         checkPhase = ''

     

       19
       19
       +
           py.test iso8601

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           homepage = https://bitbucket.org/micktwomey/pyiso8601/;

     

       24
       24
       +
           description = "Simple module to parse ISO 8601 dates";

     

       25
       25
       +
           maintainers = with lib.maintainers; [ phreedom ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+28

pkgs/development/python-modules/jdcal/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytest

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "jdcal";

     

       9
       9
       +
         version = "1.3";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "b760160f8dc8cc51d17875c6b663fafe64be699e10ce34b6a95184b5aa0fdc9e";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         checkInputs = [ pytest ];

     

       17
       17
       +
       

     

       18
       18
       +
         checkPhase = ''

     

       19
       19
       +
           py.test

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           description = "A module containing functions for converting between Julian dates and calendar dates";

     

       24
       24
       +
           homepage = "https://github.com/phn/jdcal";

     

       25
       25
       +
           license = lib.licenses.bsd2;

     

       26
       26
       +
           maintainers = with lib.maintainers; [ lihop ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+2 -2

pkgs/development/python-modules/jedi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "jedi";

     

       5
       5
       -
         version = "0.11.0";

     

       5
       5
       +
         version = "0.11.1";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396";

     

       10
       10
       +
           sha256 = "d6e799d04d1ade9459ed0f20de47c32f2285438956a677d083d3c98def59fa97";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         postPatch = ''

+24

pkgs/development/python-modules/jellyfish/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytest

     

       5
       5
       +
       , unicodecsv

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "jellyfish";

     

       10
       10
       +
         version = "0.5.6";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           sha256 = "887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         checkInputs = [ pytest unicodecsv ];

     

       18
       18
       +
       

     

       19
       19
       +
         meta = {

     

       20
       20
       +
           homepage = https://github.com/sunlightlabs/jellyfish;

     

       21
       21
       +
           description = "Approximate and phonetic matching of strings";

     

       22
       22
       +
           maintainers = with lib.maintainers; [ koral ];

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+12 -8

pkgs/development/python-modules/jinja2/default.nix

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , markupsafe }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchFromGitHub

     

       2
       2
       +
       , pytest, markupsafe }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "Jinja2";

     

       6
       6
        
         version = "2.9.6";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
       -
         src = fetchPypi {

     

       10
       10
       -
           inherit pname version;

     

       11
       11
       -
           sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "pallets";

     

       11
       11
       +
           repo = "jinja";

     

       12
       12
       +
           rev = version;

     

       13
       13
       +
           sha256 = "1xxc5vdhz214aawmllv0fi4ak6d7zac662yb7gn1xfgqfz392pg5";

     

       12
       14
        
         };

     

       13
       15
        
       

     

       16
       16
       +
         checkInputs = [ pytest ];

     

       14
       17
        
         propagatedBuildInputs = [ markupsafe ];

     

       15
       18
        
       

     

       16
       16
       -
         # No tests included

     

       17
       17
       -
         doCheck = false;

     

       19
       19
       +
         checkPhase = ''

     

       20
       20
       +
           pytest -v

     

       21
       21
       +
         '';

     

       18
       22
        
       

     

       19
       23
        
         meta = with stdenv.lib; {

     

       20
       24
        
           homepage = http://jinja.pocoo.org/;

     
···

       24
       28
        
             Jinja2 is a template engine written in pure Python. It provides a

     

       25
       29
        
             Django inspired non-XML syntax but supports inline expressions and

     

       26
       30
        
             an optional sandboxed environment.

     

       27
       27
       -
             '';

     

       31
       31
       +
           '';

     

       28
       32
        
           platforms = platforms.all;

     

       29
       33
        
           maintainers = with maintainers; [ pierron garbas sjourdois ];

     

       30
       34
        
         };

+2 -2

pkgs/development/python-modules/jsbeautifier/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonApplication rec {

     

       4
       4
        
         pname = "jsbeautifier";

     

       5
       5
       -
         version = "1.7.4";

     

       5
       5
       +
         version = "1.7.5";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         propagatedBuildInputs = [ six ];

     
···

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";

     

       14
       14
       -
           sha256 = "7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e";

     

       14
       14
       +
           sha256 = "78eb1e5c8535484f0d0b588aca38da3fb5e0e34de2d1ab53c077e71c55757473";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         meta = with stdenv.lib; {

+24

pkgs/development/python-modules/jsondiff/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "jsondiff";

     

       8
       8
       +
         version = "1.1.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "2d0437782de9418efa34e694aa59f43d7adb1899bd9a793f063867ddba8f7893";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         # No tests

     

       16
       16
       +
         doCheck = false;

     

       17
       17
       +
       

     

       18
       18
       +
         meta = {

     

       19
       19
       +
           description = "Diff JSON and JSON-like structures in Python";

     

       20
       20
       +
           homepage = https://github.com/ZoomerAnalytics/jsondiff;

     

       21
       21
       +
           license = lib.licenses.mit;

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
       }

+2 -2

pkgs/development/python-modules/jsonpatch/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "jsonpatch";

     

       9
       9
       -
         version = "1.16";

     

       9
       9
       +
         version = "1.21";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a";

     

       14
       14
       +
           sha256 = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         # test files are missing

+23

pkgs/development/python-modules/jsonpickle/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "jsonpickle";

     

       8
       8
       +
         version = "0.9.5";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "cc25dc79571d4ad7db59d05ddb7de0d76a8d598cf6136e1dbeaa9361ebcfe749";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         doCheck = false;

     

       16
       16
       +
       

     

       17
       17
       +
         meta = {

     

       18
       18
       +
           description = "Python library for serializing any arbitrary object graph into JSON";

     

       19
       19
       +
           homepage = http://jsonpickle.github.io/;

     

       20
       20
       +
           license = lib.licenses.bsd3;

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
       }

+12 -6

pkgs/development/python-modules/jupyter_client/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , nose

     

       5
       4
        
       , traitlets

     

       6
       5
        
       , jupyter_core

     

       7
       6
        
       , pyzmq

     

       8
       7
        
       , dateutil

     

       9
       8
        
       , isPyPy

     

       10
       9
        
       , py

     

       10
       10
       +
       , ipykernel

     

       11
       11
       +
       , ipython

     

       12
       12
       +
       , mock

     

       13
       13
       +
       , pytest

     

       11
       14
        
       }:

     

       12
       15
        
       

     

       13
       16
        
       buildPythonPackage rec {

     

       14
       17
        
         pname = "jupyter_client";

     

       15
       15
       -
         version = "5.1.0";

     

       16
       16
       -
         name = "${pname}-${version}";

     

       18
       18
       +
         version = "5.2.0";

     

       17
       19
        
       

     

       18
       20
        
         src = fetchPypi {

     

       19
       21
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba";

     

       22
       22
       +
           sha256 = "ca30cf1786047925ebacd6f6faa3a993efaa004b584f7d83bc8b807f7cd3f6bb";

     

       21
       23
        
         };

     

       22
       24
        
       

     

       23
       23
       -
         buildInputs = [ nose ];

     

       25
       25
       +
         checkInputs = [ ipykernel ipython mock pytest ];

     

       24
       26
        
         propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py;

     

       25
       27
        
       

     

       26
       28
        
         checkPhase = ''

     

       27
       27
       -
           nosetests -v

     

       29
       29
       +
           py.test

     

       28
       30
        
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         patches = [

     

       33
       33
       +
           ./wheel_workaround.patch

     

       34
       34
       +
         ];

     

       29
       35
        
       

     

       30
       36
        
         # Circular dependency with ipykernel

     

       31
       37
        
         doCheck = false;

+13

pkgs/development/python-modules/jupyter_client/wheel_workaround.patch

···

       1
       1
       +
       diff --git a/setup.py b/setup.py

     

       2
       2
       +
       index 95d4774..ee72cbc 100644

     

       3
       3
       +
       --- a/setup.py

     

       4
       4
       +
       +++ b/setup.py

     

       5
       5
       +
       @@ -86,7 +86,7 @@ setup_args = dict(

     

       6
       6
       +
            extras_require   = {

     

       7
       7
       +
                'test': ['ipykernel', 'ipython', 'mock'],

     

       8
       8
       +
                'test:python_version == "3.3"': ['pytest<3.3.0'],

     

       9
       9
       +
       -        'test:python_version >= "3.4" or python_version == "2.7"': ['pytest'],

     

       10
       10
       +
       +        'test:(python_version >= "3.4" or python_version == "2.7")': ['pytest'],

     

       11
       11
       +
            },

     

       12
       12
       +
            cmdclass         = {

     

       13
       13
       +
                'bdist_egg': bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled,

+3 -3

pkgs/development/python-modules/jupyter_core/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "jupyter_core";

     

       14
       14
       -
         version = "4.3.0";

     

       14
       14
       +
         version = "4.4.0";

     

       15
       15
        
         name = "${pname}-${version}";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40";

     

       19
       19
       +
           sha256 = "ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ pytest mock glibcLocales ];

     

       22
       22
       +
         checkInputs = [ pytest mock glibcLocales ];

     

       23
       23
        
         propagatedBuildInputs = [ ipython traitlets ];

     

       24
       24
        
       

     

       25
       25
        
         patches = [ ./tests_respect_pythonpath.patch ];

+20 -24

pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch

···

       1
       1
       -
       --- a/jupyter_core/tests/test_command.py	2016-09-13 15:22:49.000000000 +0200

     

       2
       2
       -
       +++ b/jupyter_core/tests/test_command.py	2017-10-23 12:49:27.489527705 +0200

     

       3
       3
       -
       @@ -113,7 +113,10 @@

     

       4
       4
       -
            witness = a.join(witness_cmd)

     

       5
       5
       -
            witness.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")'))

     

       6
       6
       -
            witness.chmod(0o700)

     

       7
       7
       -
       -    out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': ''})

     

       8
       8
       -
       +    out = check_output(

     

       9
       9
       -
       +        [sys.executable, str(jupyter), 'witness'],

     

       10
       10
       -
       +        env={'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']}

     

       11
       11
       -
       +    )

     

       12
       12
       -
            assert b'WITNESS' in out

     

       13
       13
       -
        

     

       14
       14
       -
        

     

       15
       15
       -
       @@ -136,5 +139,8 @@

     

       16
       16
       -
            witness_b.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")'))

     

       17
       17
       -
            witness_b.chmod(0o700)

     

       18
       18
       -
        

     

       19
       19
       -
       -    out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': str(b)})

     

       20
       20
       -
       +    out = check_output(

     

       21
       21
       -
       +        [sys.executable, str(jupyter), 'witness'],

     

       22
       22
       -
       +        env={'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']}

     

       23
       23
       -
       +    )

     

       24
       24
       -
            assert b'WITNESS A' in out

     

       1
       1
       +
       --- a/jupyter_core/tests/test_command.py

     

       2
       2
       +
       +++ b/jupyter_core/tests/test_command.py

     

       3
       3
       +
       @@ -131,7 +131,7 @@ def test_not_on_path(tmpdir):

     

       4
       4
       +
            witness_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')

     

       5
       5
       +
            write_executable(witness, witness_src)

     

       6
       6
       +
       

     

       7
       7
       +
       -    env = {'PATH': ''}

     

       8
       8
       +
       +    env = {'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']}

     

       9
       9
       +
            if 'SYSTEMROOT' in os.environ:  # Windows http://bugs.python.org/issue20614

     

       10
       10
       +
                env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']

     

       11
       11
       +
            if sys.platform == 'win32':

     

       12
       12
       +
       @@ -157,7 +157,7 @@ def test_path_priority(tmpdir):

     

       13
       13
       +
            witness_b_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')

     

       14
       14
       +
            write_executable(witness_b, witness_b_src)

     

       15
       15
       +
       

     

       16
       16
       +
       -    env = {'PATH':  str(b)}

     

       17
       17
       +
       +    env = {'PATH':  str(b), 'PYTHONPATH': os.environ['PYTHONPATH']}

     

       18
       18
       +
            if 'SYSTEMROOT' in os.environ:  # Windows http://bugs.python.org/issue20614

     

       19
       19
       +
                env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']

     

       20
       20
       +
            if sys.platform == 'win32':

+2 -2

pkgs/development/python-modules/keras/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "Keras";

     

       8
       8
       -
         version = "2.1.1";

     

       8
       8
       +
         version = "2.1.2";

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "f0ca2458c60d9711edf4291230b31795307ad3781cb6232ff4792b53c8f55123";

     

       13
       13
       +
           sha256 = "3ee56fc129d9d00b1916046e50056047836f97ada59df029e5661fb34442d5e8";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [

+2 -2

pkgs/development/python-modules/keyring/default.nix

···

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
         pname = "keyring";

     

       9
       9
       -
         version = "10.4.0";

     

       9
       9
       +
         version = "10.5.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh";

     

       13
       13
       +
           sha256 = "f10674bb6ecbf82e2b713627c48ad0e84178e1c9d3dc1f0373261a0765402fb2";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [

+4 -4

pkgs/development/python-modules/ldap/default.nix

···

       1
       1
        
       { lib, writeText, buildPythonPackage, isPy3k, fetchPypi

     

       2
       2
       -
       , openldap, cyrus_sasl, openssl, pytest }:

     

       2
       2
       +
       , openldap, cyrus_sasl, openssl, pytest, pyasn1 }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "python-ldap";

     

       6
       6
       -
         version = "2.4.45";

     

       6
       6
       +
         version = "2.5.2";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
         disabled = isPy3k;

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e";

     

       12
       12
       +
           sha256 = "b8c134dfedaef0e6ff4a4b94277708dcadb758b448905a83b8946df077356ed2";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ pytest ];

     

       15
       15
       +
         checkInputs = [ pytest pyasn1 ];

     

       16
       16
        
       

     

       17
       17
        
         checkPhase = ''

     

       18
       18
        
           # Needed by tests to setup a mockup ldap server.

+2 -3

pkgs/development/python-modules/ldap3/default.nix

···

       1
       1
        
       { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         version = "2.3";

     

       4
       4
       +
         version = "2.4";

     

       5
       5
        
         pname = "ldap3";

     

       6
       6
       -
         name = "${pname}-${version}";

     

       7
       6
        
       

     

       8
       7
        
         src = fetchPypi {

     

       9
       8
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "1b36lwil4iflk2ay8gi663abpnfm8id7qg4n3jkmmqbnc1sv6mn0";

     

       9
       9
       +
           sha256 = "888015f849eb33852583bbaf382f61593b03491cdac6098fd5d4d0252e0e7e66";

     

       11
       10
        
         };

     

       12
       11
        
       

     

       13
       12
        
         buildInputs = [ gssapi ];

+1 -1

pkgs/development/python-modules/libusb1/default.nix

···

       12
       12
        
         postPatch = lib.optionalString stdenv.isLinux ''

     

       13
       13
        
           substituteInPlace usb1/libusb1.py --replace \

     

       14
       14
        
             "ctypes.util.find_library(base_name)" \

     

       15
       15
       -
             "'${libusb1}/lib/libusb${stdenv.hostPlatform.extensions.sharedLibrary}'"

     

       15
       15
       +
             "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'"

     

       16
       16
        
         '';

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [ libusb1 ];

+2 -2

pkgs/development/python-modules/line_profiler/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "line_profiler";

     

       12
       12
       -
         version = "2.0";

     

       12
       12
       +
         version = "2.1.2";

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381";

     

       17
       17
       +
           sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [ cython ];

+2 -2

pkgs/development/python-modules/llfuse/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "llfuse";

     

       7
       7
       -
         version = "1.0";

     

       7
       7
       +
         version = "1.3.2";

     

       8
       8
        
         name = pname + "-" + version;

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://pypi/l/llfuse/${name}.tar.bz2";

     

       12
       12
       -
           sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps";

     

       12
       12
       +
           sha256 = "96252a286a2be25810904d969b330ef2a57c2b9c18c5b503bbfbae40feb2bb63";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig ];

+6 -7

pkgs/development/python-modules/llvmlite/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
       -
       , fetchurl

     

       2
       2
       +
       , fetchPypi

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , python

     

       5
       5
        
       , llvm

     
···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "llvmlite";

     

       13
       13
       -
         name = "${pname}-${version}";

     

       14
       14
       -
         version = "0.20.0";

     

       13
       13
       +
         version = "0.21.0";

     

       15
       14
        
       

     

       16
       15
        
         disabled = isPyPy;

     

       17
       16
        
       

     

       18
       18
       -
         src = fetchurl {

     

       19
       19
       -
           url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";

     

       20
       20
       -
           sha256 = "b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29";

     

       17
       17
       +
         src = fetchPypi {

     

       18
       18
       +
           inherit pname version;

     

       19
       19
       +
           sha256 = "3a5dd0695fdfb9fd47464cd71791b84935bf9642e11f4811d57aa1f2da8cdaa8";

     

       21
       20
        
         };

     

       22
       21
        
       

     

       23
       22
        
         propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;

     

       24
       23
        
       

     

       25
       24
        
         # Disable static linking

     

       26
       25
        
         # https://github.com/numba/llvmlite/issues/93

     

       27
       27
       -
         patchPhase = ''

     

       26
       26
       +
         postPatch = ''

     

       28
       27
        
           substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""

     

       29
       28
        
       

     

       30
       29
        
           substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"

+27

pkgs/development/python-modules/lxml/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , libxml2

     

       5
       5
       +
       , libxslt

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "lxml";

     

       10
       10
       +
         version = "4.1.1";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         buildInputs = [ libxml2 libxslt ];

     

       18
       18
       +
       

     

       19
       19
       +
         hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";

     

       20
       20
       +
       

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           description = "Pythonic binding for the libxml2 and libxslt libraries";

     

       23
       23
       +
           homepage = http://lxml.de;

     

       24
       24
       +
           license = stdenv.lib.licenses.bsd3;

     

       25
       25
       +
           maintainers = with stdenv.lib.maintainers; [ sjourdois ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -2

pkgs/development/python-modules/marionette-harness/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "marionette-harness";

     

       17
       17
       -
         version = "4.1.0";

     

       17
       17
       +
         version = "4.3.0";

     

       18
       18
        
         name = "${pname}-${version}";

     

       19
       19
        
         disabled = isPy3k;

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           sha256 = "20c188791e28d586c58acf86ff28cb704c4195a4da6eb10db7b8c6771e3f2983";

     

       23
       23
       +
           sha256 = "a98bb65a0c63f60d9e3d7ef21dabc9c29676917dc2ec0d46851a3ed694c820cc";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest

+28

pkgs/development/python-modules/markdown/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , nose

     

       5
       5
       +
       , pyyaml

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "Markdown";

     

       10
       10
       +
         version = "2.6.10";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           extension = "zip";

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           sha256 = "cfa536d1ee8984007fcecc5a38a493ff05c174cb74cb2341dafd175e6bc30851";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         # error: invalid command 'test'

     

       19
       19
       +
       #   doCheck = false;

     

       20
       20
       +
       

     

       21
       21
       +
         checkInputs = [ nose pyyaml ];

     

       22
       22
       +
       

     

       23
       23
       +
         meta = {

     

       24
       24
       +
           description = "A Python implementation of John Gruber’s Markdown with Extension support";

     

       25
       25
       +
           homepage = https://github.com/Python-Markdown/markdown;

     

       26
       26
       +
           license = lib.licenses.bsd3;

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+2 -2

pkgs/development/python-modules/marshmallow/default.nix

···

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "marshmallow";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
       -
         version = "2.14.0";

     

       8
       8
       +
         version = "2.15.0";

     

       9
       9
        
       

     

       10
       10
        
         meta = {

     

       11
       11
        
           homepage = "https://github.com/marshmallow-code/marshmallow";

     
···

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "09943a460026b9a61c3f4cedd0e5ccfed7cfce3271debd19e3f97df561088718";

     

       21
       21
       +
           sha256 = "d3f31fe7be2106b1d783cbd0765ef4e1c6615505514695f33082805f929dd584";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [ dateutil simplejson ];

+2 -2

pkgs/development/python-modules/matplotlib/default.nix

···

       20
       20
        
       assert enableQt -> pyqt4 != null;

     

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
       -
         version = "2.1.0";

     

       23
       23
       +
         version = "2.1.1";

     

       24
       24
        
         pname = "matplotlib";

     

       25
       25
        
         name = "${pname}-${version}";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchurl {

     

       28
       28
        
           url = "mirror://pypi/m/matplotlib/${name}.tar.gz";

     

       29
       29
       -
           sha256 = "4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387";

     

       29
       29
       +
           sha256 = "659f5e1aa0e0f01488c61eff47560c43b8be511c6a29293d7f3896ae17bd8b23";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

+2 -2

pkgs/development/python-modules/mistune/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "mistune";

     

       9
       9
       -
         version = "0.7.4";

     

       9
       9
       +
         version = "0.8.3";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "0byj9jg9ly7karf5sb1aqcw7avaim9sxl8ws7yw7p1fibjgsy5w5";

     

       14
       14
       +
           sha256 = "bc10c33bfdcaa4e749b779f62f60d6e12f8215c46a292d05e486b869ae306619";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = [ nose ];

+15 -5

pkgs/development/python-modules/moto/default.nix

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, requests, pytz

     

       2
       2
       -
       , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil }:

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask

     

       2
       2
       +
       , requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker

     

       3
       3
       +
       , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }:

     

       3
       4
        
       

     

       4
       5
        
       buildPythonPackage rec {

     

       5
       6
        
         pname = "moto";

     

       6
       6
       -
         version = "0.4.31";

     

       7
       7
       -
         name    = "moto-${version}";

     

       7
       7
       +
         version = "1.1.25";

     

       8
       8
       +
       

     

       8
       9
        
         src = fetchPypi {

     

       9
       10
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "19s8hfz4mzzzdksa0ddlvrga5mxdaqahk89p5l29a5id8127shr8";

     

       11
       11
       +
           sha256 = "d427d6e1a81e926c2b6a071453807b05f4736d65068493e1f3055ac7ee24ea21";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         propagatedBuildInputs = [

     

       15
       15
       +
           aws-xray-sdk

     

       14
       16
        
           boto

     

       17
       17
       +
           boto3

     

       15
       18
        
           dateutil

     

       16
       19
        
           flask

     

       17
       20
        
           httpretty

     
···

       21
       24
        
           requests

     

       22
       25
        
           six

     

       23
       26
        
           xmltodict

     

       27
       27
       +
           mock

     

       28
       28
       +
           pyaml

     

       29
       29
       +
           backports_tempfile

     

       30
       30
       +
           cookies

     

       31
       31
       +
           jsondiff

     

       32
       32
       +
           botocore

     

       33
       33
       +
           docker

     

       24
       34
        
         ];

     

       25
       35
        
       

     

       26
       36
        
         checkInputs = [ boto3 nose sure freezegun ];

+2 -3

pkgs/development/python-modules/mygpoclient/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         name = "mygpoclient-${version}";

     

       4
       4
       +
         pname = "mypgoclient";

     

       5
       5
        
         version = "1.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     
···

       11
       11
        
           sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ nose minimock ];

     

       14
       14
       +
         checkInputs = [ nose minimock ];

     

       15
       15
        
       

     

       16
       16
        
         checkPhase = ''

     

       17
       17
        
           nosetests

     
···

       25
       25
        
           '';

     

       26
       26
        
           homepage = https://github.com/gpodder/mygpoclient;

     

       27
       27
        
           license = with licenses; [ gpl3 ];

     

       28
       28
       -
           platforms = with platforms; linux ++ darwin;

     

       29
       28
        
           maintainers = with maintainers; [ skeidel ];

     

       30
       29
        
         };

     

       31
       30
        
       }

+2 -2

pkgs/development/python-modules/nbxmpp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "nbxmpp";

     

       5
       5
       -
         version = "0.6.0";

     

       5
       5
       +
         version = "0.6.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "0x495yb0abkdspyziw7dyyjwxx6ivnv5zznk92wa3mcind5s9757";

     

       9
       9
       +
           sha256 = "10bfb12b083a7509779298c31b4b61e2ed7e78d1960cbcfb3de8d38f3b830991";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         meta = with stdenv.lib; {

+34

pkgs/development/python-modules/networkx/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , nose

     

       5
       5
       +
       , decorator

     

       6
       6
       +
       , isPy36

     

       7
       7
       +
       , isPyPy

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "networkx";

     

       12
       12
       +
         version = "1.11";

     

       13
       13
       +
       

     

       14
       14
       +
         # Currently broken on PyPy.

     

       15
       15
       +
         # https://github.com/networkx/networkx/pull/1361

     

       16
       16
       +
         disabled = isPyPy;

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchPypi {

     

       19
       19
       +
           inherit pname version;

     

       20
       20
       +
           sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         checkInputs = [ nose ];

     

       24
       24
       +
         propagatedBuildInputs = [ decorator ];

     

       25
       25
       +
       

     

       26
       26
       +
         # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299

     

       27
       27
       +
         doCheck = !(isPy36);

     

       28
       28
       +
       

     

       29
       29
       +
         meta = {

     

       30
       30
       +
           homepage = "https://networkx.github.io/";

     

       31
       31
       +
           description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks";

     

       32
       32
       +
           license = lib.licenses.bsd3;

     

       33
       33
       +
         };

     

       34
       34
       +
       }

+2 -2

pkgs/development/python-modules/nilearn/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "nilearn";

     

       6
       6
       -
         version = "0.3.1";

     

       6
       6
       +
         version = "0.4.0";

     

       7
       7
        
         name = pname + "-" + version;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "0kkarh5cdcd2czs0bf0s1g51qas84mfxfq0dzd7k5h5l0qr4zy06";

     

       11
       11
       +
           sha256 = "bb692254bde35d7e1d3d1534d9b3117810b35a744724625f150fbbc64d519c02";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         checkPhase = "nosetests --exclude with_expand_user nilearn/tests";

+2 -2

pkgs/development/python-modules/notebook/default.nix

···

       22
       22
        
       

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "notebook";

     

       25
       25
       -
         version = "5.2.1";

     

       25
       25
       +
         version = "5.2.2";

     

       26
       26
        
         name = "${pname}-${version}";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchPypi {

     

       29
       29
        
           inherit pname version;

     

       30
       30
       -
           sha256 = "4ae5b81dd39b37cdd99dcffe83a5182c849947b92d46ac4d2b5093af2bb9f224";

     

       30
       30
       +
           sha256 = "7bb54fb61b9c5426bc116f840541b973431198e00ea2896122d05fc122dbbd67";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         LC_ALL = "en_US.utf8";

+6 -7

pkgs/development/python-modules/numba/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
       -
       , fetchurl

     

       2
       2
       +
       , fetchPypi

     

       3
       3
        
       , python

     

       4
       4
        
       , buildPythonPackage

     

       5
       5
        
       , isPy27

     
···

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
       -
         version = "0.35.0";

     

       17
       17
       +
         version = "0.36.2";

     

       18
       18
        
         pname = "numba";

     

       19
       19
       -
         name = "${pname}-${version}";

     

       20
       19
        
       

     

       21
       21
       -
         src = fetchurl {

     

       22
       22
       -
           url = "mirror://pypi/n/numba/${name}.tar.gz";

     

       23
       23
       -
           sha256 = "11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3";

     

       20
       20
       +
         src = fetchPypi {

     

       21
       21
       +
           inherit pname version;

     

       22
       22
       +
           sha256 = "d61597808ce511e81b64e32da664f52beb7d947bf834dde8b8b60b29d205e5c2";

     

       24
       23
        
         };

     

       25
       24
        
       

     

       26
       25
        
         NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

     
···

       29
       28
        
       

     

       30
       29
        
         # Copy test script into $out and run the test suite.

     

       31
       30
        
         checkPhase = ''

     

       32
       32
       -
           python -m numba.runtests

     

       31
       31
       +
           ${python.interpreter} -m numba.runtests

     

       33
       32
        
         '';

     

       34
       33
        
         # ImportError: cannot import name '_typeconv'

     

       35
       34
        
         doCheck = false;

+4 -7

pkgs/development/python-modules/odfpy/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       +
       , python

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       6
       7
        
       buildPythonPackage rec {

     

       7
       8
        
         pname = "odfpy";

     

       8
       8
       -
         version = "1.3.5";

     

       9
       9
       +
         version = "1.3.6";

     

       9
       10
        
         name = "${pname}-${version}";

     

       10
       11
        
       

     

       11
       12
        
         src = fetchPypi {

     

       12
       13
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "6f8163f8464868cff9421a058f25566e41d73c8f7e849c021b86630941b44366";

     

       14
       14
       +
           sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b";

     

       14
       15
        
         };

     

       15
       16
        
       

     

       16
       17
        
         checkPhase = ''

     

       17
       17
       -
           pushd tests

     

       18
       18
       -
           rm runtests

     

       19
       19
       -
           for file in test*.py; do

     

       20
       20
       -
               python  $file

     

       21
       21
       -
           done

     

       18
       18
       +
           ${python.interpreter} -m unittest discover -s tests

     

       22
       19
        
         '';

     

       23
       20
        
       

     

       24
       21
        
         meta = {

+2 -2

pkgs/development/python-modules/pandas/default.nix

···

       28
       28
        
         inherit (stdenv) isDarwin;

     

       29
       29
        
       in buildPythonPackage rec {

     

       30
       30
        
         pname = "pandas";

     

       31
       31
       -
         version = "0.21.1";

     

       31
       31
       +
         version = "0.22.0";

     

       32
       32
        
         name = "${pname}-${version}";

     

       33
       33
        
       

     

       34
       34
        
         src = fetchPypi {

     

       35
       35
        
           inherit pname version;

     

       36
       36
       -
           sha256 = "c5f5cba88bf0659554c41c909e1f78139f6fce8fa9315a29a23692b38ff9788a";

     

       36
       36
       +
           sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         LC_ALL = "en_US.UTF-8";

+3 -4

pkgs/development/python-modules/parse-type/default.nix

···

       3
       3
        
       , pytest, pytestrunner

     

       4
       4
        
       , parse, six, enum34

     

       5
       5
        
       }:

     

       6
       6
       +
       

     

       6
       7
        
       buildPythonPackage rec {

     

       7
       7
       -
         pname = "parse-type";

     

       8
       8
       +
         pname = "parse_type";

     

       8
       9
        
         version = "0.3.4";

     

       9
       9
       -
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
       -
           inherit version;

     

       13
       13
       -
           pname = "parse_type";

     

       12
       12
       +
           inherit pname version;

     

       14
       13
        
           sha256 = "3dd0b323bafcb8c25e000ce5589042a1c99cba9c3bec77b9f591e46bc9606147";

     

       15
       14
        
         };

     

       16
       15

+35

pkgs/development/python-modules/partd/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytest

     

       5
       5
       +
       , locket

     

       6
       6
       +
       , numpy

     

       7
       7
       +
       , pandas

     

       8
       8
       +
       , pyzmq

     

       9
       9
       +
       , toolz

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "partd";

     

       14
       14
       +
         version = "0.3.8";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchPypi {

     

       17
       17
       +
           inherit pname version;

     

       18
       18
       +
           sha256 = "67291f1c4827cde3e0148b3be5d69af64b6d6169feb9ba88f0a6cfe77089400f";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         checkInputs = [ pytest ];

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ];

     

       24
       24
       +
       

     

       25
       25
       +
         checkPhase = ''

     

       26
       26
       +
           rm partd/tests/test_zmq.py # requires network & fails

     

       27
       27
       +
           py.test

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         meta = {

     

       31
       31
       +
           description = "Appendable key-value storage";

     

       32
       32
       +
           license = with lib.licenses; [ bsd3 ];

     

       33
       33
       +
           homepage = https://github.com/dask/partd/;

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+2 -2

pkgs/development/python-modules/path.py/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "path.py";

     

       12
       12
       -
         version = "10.4";

     

       12
       12
       +
         version = "10.5";

     

       13
       13
        
         name = pname + "-" + version;

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "c63c75777c8a01f7b273c0065a8ea1e3ba0c9b369fa4a2601831e412b2c4881a";

     

       17
       17
       +
           sha256 = "63a7af08676668fd51750f111affbd38c1a13c61aba15c6665b16681771c79a8";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [ pytest pytestrunner ];

+4 -3

pkgs/development/python-modules/pathlib2/default.nix

···

       5
       5
        
       , pythonOlder

     

       6
       6
        
       , scandir

     

       7
       7
        
       , glibcLocales

     

       8
       8
       +
       , mock

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       if !(pythonOlder "3.4") then null else buildPythonPackage rec {

     

       11
       12
        
         pname = "pathlib2";

     

       12
       12
       -
         version = "2.2.1";

     

       13
       13
       +
         version = "2.3.0";

     

       13
       14
        
       

     

       14
       15
        
         src = fetchPypi {

     

       15
       16
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d";

     

       17
       17
       +
           sha256 = "d32550b75a818b289bd4c1f96b60c89957811da205afcceab75bc8b4857ea5b3";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir;

     

       20
       20
       -
         checkInputs = [ glibcLocales ];

     

       21
       21
       +
         checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock;

     

       21
       22
        
       

     

       22
       23
        
         preCheck = ''

     

       23
       24
        
           export LC_ALL="en_US.UTF-8"

+2 -2

pkgs/development/python-modules/pexpect/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "pexpect";

     

       9
       9
       -
         version = "4.3.0";

     

       9
       9
       +
         version = "4.3.1";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "1nfjmz81gsixv22dywidakm7pff3ly1i4yly950bfp8gz1r0iaq0";

     

       14
       14
       +
           sha256 = "8e287b171dbaf249d0b06b5f2e88cb7e694651d2d0b8c15bccb83170d3c55575";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         # Wants to run pythonin a subprocess

+2 -2

pkgs/development/python-modules/phonenumbers/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "phonenumbers";

     

       5
       5
       -
         version = "8.8.6";

     

       5
       5
       +
         version = "8.8.8";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "ab1fa853350dde91be672192b427169b29e3348c236e46ad7a757e4ac8163c8c";

     

       10
       10
       +
           sha256 = "ff2f492e49c212bb7185954efe09e68583a67daec586c02c49bc728c343d4eb0";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         meta = {

+4 -2

pkgs/development/python-modules/pip-tools/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "pip-tools";

     

       6
       6
       -
         version = "1.10.2";

     

       6
       6
       +
         version = "1.11.0";

     

       7
       7
        
         name = pname + "-" + version;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://pypi/p/pip-tools/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "d381c7249eb48350cc49447cc106df3d90e9e806b13caaede602c1cd38f61b37";

     

       11
       11
       +
           sha256 = "ba427b68443466c389e3b0b0ef55f537ab39344190ea980dfebb333d0e6a50a3";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         LC_ALL = "en_US.UTF-8";

     
···

       21
       21
        
           "test_generate_hashes_all_platforms"

     

       22
       22
        
           "test_generate_hashes_without_interfering_with_each_other"

     

       23
       23
        
           "test_realistic_complex_sub_dependencies"

     

       24
       24
       +
           "test_generate_hashes_with_editable"

     

       24
       25
        
           # Expect specific version of "six":

     

       25
       26
        
           "test_editable_package"

     

       26
       27
        
           "test_input_file_without_extension"

     

       28
       28
       +
           "test_locally_available_editable_package_is_not_archived_in_cache_dir"

     

       27
       29
        
         ];

     

       28
       30
        
       

     

       29
       31
        
         checkPhase = ''

+27

pkgs/development/python-modules/plone-testing/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , zope_testing

     

       5
       5
       +
       , setuptools

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "plone.testing";

     

       10
       10
       +
         version = "5.1.1";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           sha256 = "2ca558a910b93355b760535b233518be3a06c58e46160487bf802b6f7cb1e511";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         propagatedBuildInputs = [ setuptools zope_testing ];

     

       18
       18
       +
       

     

       19
       19
       +
         # Huge amount of testing dependencies (including Zope2)

     

       20
       20
       +
         doCheck = false;

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           description = "Testing infrastructure for Zope and Plone projects";

     

       24
       24
       +
           homepage = https://github.com/plone/plone.testing;

     

       25
       25
       +
           license = lib.licenses.bsd3;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -2

pkgs/development/python-modules/plotly/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "plotly";

     

       13
       13
       -
         version = "2.1.0";

     

       13
       13
       +
         version = "2.2.3";

     

       14
       14
        
         name = "${pname}-${version}";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "ff6899dc11907b1efb944f79f9583b2e30ba2964bb009145f3580bf30b4d9ee4";

     

       18
       18
       +
           sha256 = "dadd2263f1c0449b248fd3742a077d9594935921a9597529be76d6a841237ab0";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

+29

pkgs/development/python-modules/pluggy/default.nix

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytest

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "pluggy";

     

       9
       9
       +
         version = "0.6.0";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         checkPhase = ''

     

       17
       17
       +
           py.test

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       20
       20
       +
         # To prevent infinite recursion with pytest

     

       21
       21
       +
         doCheck = false;

     

       22
       22
       +
       

     

       23
       23
       +
         meta = {

     

       24
       24
       +
           description = "Plugin and hook calling mechanisms for Python";

     

       25
       25
       +
           homepage = "https://pypi.python.org/pypi/pluggy";

     

       26
       26
       +
           license = lib.licenses.mit;

     

       27
       27
       +
           maintainers = with lib.maintainers; [ jgeerds ];

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+2 -2

pkgs/development/python-modules/plumbum/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "plumbum";

     

       9
       9
       -
         version = "1.6.3";

     

       9
       9
       +
         version = "1.6.5";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         checkInputs = [ pytest ];

     
···

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "0249e708459f1b05627a7ca8787622c234e4db495a532acbbd1f1f17f28c7320";

     

       19
       19
       +
           sha256 = "d8abb059bb62beb6c99db08d3598167abaeeab53eaf218f91e74bae471a24bee";

     

       20
       20
        
         };

     

       21
       21
        
       }

+2 -2

pkgs/development/python-modules/psutil/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "psutil";

     

       10
       10
       -
         version = "5.4.1";

     

       10
       10
       +
         version = "5.4.2";

     

       11
       11
        
         name = "${pname}-${version}";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "42e2de159e3c987435cb3b47d6f37035db190a1499f3af714ba7af5c379b6ba2";

     

       15
       15
       +
           sha256 = "00a1f9ff8d1e035fba7bfdd6977fa8ea7937afdb4477339e5df3dba78194fe11";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         # No tests in archive

+2 -2

pkgs/development/python-modules/py/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi }:

     

       2
       2
        
       buildPythonPackage rec {

     

       3
       3
        
         pname = "py";

     

       4
       4
       -
         version = "1.4.34";

     

       4
       4
       +
         version = "1.5.2";

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g";

     

       9
       9
       +
           sha256 = "ca18943e28235417756316bfada6cd96b23ce60dd532642690dcfdaba988a76d";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # Circular dependency on pytest

+27

pkgs/development/python-modules/pyaml/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pyyaml

     

       5
       5
       +
       , unidecode

     

       6
       6
       +
       , python

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "pyaml";

     

       11
       11
       +
         version = "17.12.1";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           sha256 = "66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = [ pyyaml ];

     

       19
       19
       +
       

     

       20
       20
       +
         checkInputs = [ unidecode ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           description = "PyYAML-based module to produce pretty and readable YAML-serialized data";

     

       24
       24
       +
           homepage = https://github.com/mk-fg/pretty-yaml;

     

       25
       25
       +
           license = lib.licenses.wtfpl;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -2

pkgs/development/python-modules/pyasn1-modules/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         name = "${pname}-${version}";

     

       5
       5
        
         pname = "pyasn1-modules";

     

       6
       6
       -
         version = "0.1.5";

     

       6
       6
       +
         version = "0.2.1";

     

       7
       7
        
         disabled = isPyPy;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "1239h6h67vg0wazg2qgv6m3hdim2gs66pl89lbnayk55bbnkwc0x";

     

       11
       11
       +
           sha256 = "af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ pyasn1 ];

+2 -2

pkgs/development/python-modules/pyasn1/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         name = "${pname}-${version}";

     

       5
       5
        
         pname = "pyasn1";

     

       6
       6
       -
         version = "0.3.4";

     

       6
       6
       +
         version = "0.4.2";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "06hhy38jhwh95gpn8f03cr439273fsfsh4vhd5024r86nh5gyiir";

     

       10
       10
       +
           sha256 = "d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/python-modules/pyblake2/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "pyblake2";

     

       8
       8
       -
         version = "0.9.3";

     

       8
       8
       +
         version = "1.1.0";

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212";

     

       13
       13
       +
           sha256 = "3a850036bf42053c74bfc52c063323ca78e40ba1f326b01777da5750a143631a";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # requires setting up sphinx doctest

+7 -6

pkgs/development/python-modules/pycangjie/default.nix

···

       1
       1
        
       { stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie

     

       2
       2
       -
       , sqlite, python, cython

     

       2
       2
       +
       , sqlite, buildPythonPackage, cython

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "${python.libPrefix}-pycangjie-${version}";

     

       5
       5
       +
       let

     

       6
       6
       +
         rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";

     

       7
       7
       +
       in buildPythonPackage rec {

     

       8
       8
       +
         pname = "pycangjie";

     

       7
       9
        
         version = "1.3_rev_${rev}";

     

       8
       8
       -
         rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";

     

       10
       10
       +
         format = "other";

     

       9
       11
        
       

     

       10
       12
        
         src = fetchurl {

     

       11
       11
       -
           name = "${name}.tar.gz";

     

       12
       13
        
           url = "https://github.com/Cangjians/pycangjie/archive/${rev}.tar.gz";

     

       13
       14
        
           sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05";

     

       14
       15
        
         };

     

       15
       16
        
       

     

       16
       17
        
         nativeBuildInputs = [ pkgconfig ];

     

       17
       18
        
         buildInputs = [

     

       18
       18
       -
           autoconf automake libtool libcangjie sqlite python cython

     

       19
       19
       +
           autoconf automake libtool libcangjie sqlite cython

     

       19
       20
        
         ];

     

       20
       21
        
       

     

       21
       22
        
         preConfigure = ''

+2 -2

pkgs/development/python-modules/pychromecast/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "PyChromecast";

     

       5
       5
       -
         version = "0.8.1";

     

       5
       5
       +
         version = "1.0.3";

     

       6
       6
        
         name = pname + "-" + version;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";

     

       10
       10
       -
           sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";

     

       10
       10
       +
           sha256 = "714a9e03e6a258081e3b6296ed15592e015facbe38bbe60819cca6f04c599f25";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ requests six zeroconf protobuf ];

+3 -4

pkgs/development/python-modules/pycollada/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pycollada";

     

       5
       5
       -
         version = "0.5";

     

       6
       6
       -
         name = "${pname}-${version}";

     

       5
       5
       +
         version = "0.6";

     

       7
       6
        
       

     

       8
       7
        
         src = fetchPypi {

     

       9
       8
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "1g96maw2c25l4i3ks51784h33zf7s18vrn6iyz4ca34iy4sl7yq9";

     

       9
       9
       +
           sha256 = "fcd6f38fd981e350f9ec754d9671834017accd600e967d6d299a6cfdae5ba4f4";

     

       11
       10
        
         };

     

       12
       11
        
       

     

       13
       13
       -
         buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]);

     

       12
       12
       +
         propagatedBuildInputs = [ numpy dateutil ];

     

       14
       13
        
       

     

       15
       14
        
         # Some tests fail because they refer to test data files that don't exist

     

       16
       15
        
         # (upstream packaging issue)

+2 -2

pkgs/development/python-modules/pydot/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pydot";

     

       11
       11
       -
         version = "1.2.3";

     

       11
       11
       +
         version = "1.2.4";

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "edb5d3f249f97fbd9c4bb16959e61bc32ecf40eee1a9f6d27abe8d01c0a73502";

     

       16
       16
       +
           sha256 = "92d2e2d15531d00710f2d6fb5540d2acabc5399d464f2f20d5d21073af241eb6";

     

       17
       17
        
         };

     

       18
       18
        
         checkInputs = [ chardet ];

     

       19
       19
        
         # No tests in archive

+2 -2

pkgs/development/python-modules/pygit2/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         name = "${pname}-${version}";

     

       5
       5
        
         pname = "pygit2";

     

       6
       6
       -
         version = "0.26.0";

     

       6
       6
       +
         version = "0.26.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "1cbc488ra3kg7r3qky17ms0szi3cda2d96qfkv1l9djsy9hnvw57";

     

       10
       10
       +
           sha256 = "29baa530d6fcbf7cca6a75cf9c78fb88613ca81afb39c62fe492f226f6b61800";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         preConfigure = lib.optionalString stdenv.isDarwin ''

+6 -5

pkgs/development/python-modules/pyglet/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , mesa, xorg, freetype, fontconfig}:

     

       2
       2
       +
       , mesa, xorg, freetype, fontconfig, future}:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
       -
         version = "1.2.4";

     

       5
       5
       +
         version = "1.3.0";

     

       6
       6
        
         pname = "pyglet";

     

       7
       7
       -
         name = "${pname}-${version}";

     

       8
       7
        
       

     

       9
       8
        
         src = fetchPypi {

     

       10
       9
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445";

     

       10
       10
       +
           sha256 = "640a8f8e3d7bf8dbb551fa707f14021f619932990ab1401c48ba9dbcc6c2242c";

     

       12
       11
        
         };

     

       13
       12
        
       

     

       14
       14
       -
         patchPhase = let

     

       13
       13
       +
         postPatch = let

     

       15
       14
        
           libs = [ mesa xorg.libX11 freetype fontconfig ];

     

       16
       15
        
           paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs);

     

       17
       16
        
         in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py";

     

       18
       17
        
       

     

       19
       18
        
         doCheck = false;

     

       19
       19
       +
       

     

       20
       20
       +
         propagatedBuildInputs = [ future ];

     

       20
       21
        
       

     

       21
       22
        
         meta = with stdenv.lib; {

     

       22
       23
        
           homepage = "http://www.pyglet.org/";

+2 -2

pkgs/development/python-modules/pylast/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pylast";

     

       5
       5
       -
         version = "1.9.0";

     

       5
       5
       +
         version = "2.0.0";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4";

     

       10
       10
       +
           sha256 = "8e4d4962aa12d67bd357e1aa596a146b2e97afd943b5c9257e555014d13b3065";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ certifi six ];

+2 -2

pkgs/development/python-modules/pylint/default.nix

···

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
        
         pname = "pylint";

     

       7
       7
       -
         version = "1.7.4";

     

       7
       7
       +
         version = "1.8.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "1f65b3815c3bf7524b845711d54c4242e4057dd93826586620239ecdfe591fb1";

     

       11
       11
       +
           sha256 = "3035e44e37cd09919e9edad5573af01d7c6b9c52a0ebb4781185ae7ab690458b";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];

+2 -2

pkgs/development/python-modules/pymongo/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pymongo";

     

       5
       5
       -
         version = "3.5.1";

     

       5
       5
       +
         version = "3.6.0";

     

       6
       6
        
         name  = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0939bl3brrklvccicck62gs3zd7i9aysz13c8pxc3gpk2hsdj878";

     

       10
       10
       +
           sha256 = "c6de26d1e171cdc449745b82f1addbc873d105b8e7335097da991c0fc664a4a8";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         doCheck = false;

+2 -2

pkgs/development/python-modules/pyobjc/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         name = "${pname}-${version}";

     

       5
       5
        
         pname = "pyobjc";

     

       6
       6
       -
         version = "4.0b1";

     

       6
       6
       +
         version = "4.1";

     

       7
       7
        
       

     

       8
       8
        
         # Gives "No matching distribution found for

     

       9
       9
        
         # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)"

     
···

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "16bng6960c1m57nnh1l09ycnyimrqzw9mx9pnyjxn5zzm5kalr37";

     

       14
       14
       +
           sha256 = "287db11f912ac7d05c4907dbf6e74abaa475e36368f7c92e05aca2886a94562c";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         meta = {

+9 -4

pkgs/development/python-modules/pyopencl/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "pyopencl";

     

       18
       18
       -
         version = "2017.2";

     

       19
       19
       -
         name = "${pname}-${version}";

     

       18
       18
       +
         version = "2017.2.2";

     

       20
       19
        
       

     

       21
       21
       -
         buildInputs = [ pytest opencl-headers ocl-icd ];

     

       20
       20
       +
         checkInputs = [ pytest ];

     

       21
       21
       +
         buildInputs = [ opencl-headers ocl-icd ];

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];

     

       24
       24
        
       

     

       25
       25
        
         src = fetchPypi {

     

       26
       26
        
           inherit pname version;

     

       27
       27
       -
           sha256 = "039b689a58eb98e27a577ac086210deae959f40d657487f3199d2d217c270ff9";

     

       27
       27
       +
           sha256 = "d2f7b04d2e819c6e90d6366b7712a7452a39fba218e51b11b02c85ab07fd2983";

     

       28
       28
        
         };

     

       29
       29
       +
       

     

       30
       30
       +
         # py.test is not needed during runtime, so remove it from `install_requires`

     

       31
       31
       +
         postPatch = ''

     

       32
       32
       +
           substituteInPlace setup.py --replace "pytest>=2" ""

     

       33
       33
       +
         '';

     

       29
       34
        
       

     

       30
       35
        
         # gcc: error: pygpu_language_opencl.cpp: No such file or directory

     

       31
       36
        
         doCheck = false;

+1 -1

pkgs/development/python-modules/pysc2/default.nix

···

       18
       18
        
       }:

     

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
       +
         pname = "PySC2";

     

       21
       22
        
         version = "1.2";

     

       22
       22
       -
         name = "PySC2-${version}";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "deepmind";

+2 -2

pkgs/development/python-modules/pysoundfile/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "PySoundFile";

     

       14
       14
       -
         version = "0.8.1";

     

       14
       14
       +
         version = "0.9.0.post1";

     

       15
       15
        
         name = pname + "-" + version;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df";

     

       19
       19
       +
           sha256 = "43dd46a2afc0484c26930a7e59eef9365cee81bce7a4aadc5699f788f60d32c3";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
           checkInputs = [ pytest ];

+2 -2

pkgs/development/python-modules/pytest-localserver/default.nix

···

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pytest-localserver";

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
       -
         version = "0.3.7";

     

       13
       13
       +
         version = "0.4.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "1c11hn61n06ms0wmw6536vs5k4k9hlndxsb3p170nva56a9dfa6q";

     

       17
       17
       +
           sha256 = "a72af60a1ec8f73668a7884c86baf1fbe48394573cb4fa36709887217736c021";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ werkzeug ];

+2 -2

pkgs/development/python-modules/pytest-xdist/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         name = "${pname}-${version}";

     

       5
       5
        
         pname = "pytest-xdist";

     

       6
       6
       -
         version = "1.20.1";

     

       6
       6
       +
         version = "1.21.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "433e82f9b34986a4e4b2be38c60e82cca3ac64b7e1b38f4d8e3e118292939712";

     

       10
       10
       +
           sha256 = "0b8622435e3c0650a8d5a07b73a7f9c4f79b52d7ed060536a6041f0da423ba8e";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ pytest setuptools_scm pytest-forked];

+27

pkgs/development/python-modules/pytest/3_2.nix

···

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py

     

       2
       2
       +
       , setuptools_scm, setuptools

     

       3
       3
       +
       }:

     

       4
       4
       +
       buildPythonPackage rec {

     

       5
       5
       +
         version = "3.2.5";

     

       6
       6
       +
         pname = "pytest";

     

       7
       7
       +
       

     

       8
       8
       +
         preCheck = ''

     

       9
       9
       +
           # don't test bash builtins

     

       10
       10
       +
           rm testing/test_argcomplete.py

     

       11
       11
       +
         '';

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         checkInputs = [ hypothesis ];

     

       19
       19
       +
         buildInputs = [ setuptools_scm ];

     

       20
       20
       +
         propagatedBuildInputs = [ py setuptools ]

     

       21
       21
       +
           ++ (stdenv.lib.optional isPy26 argparse);

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
       +
           maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];

     

       25
       25
       +
           platforms = platforms.unix;

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+7 -5

pkgs/development/python-modules/pytest/default.nix

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py

     

       2
       2
       -
       , setuptools_scm, setuptools

     

       1
       1
       +
       { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py

     

       2
       2
       +
       , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k

     

       3
       3
        
       }:

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
       -
         version = "3.2.5";

     

       5
       5
       +
         version = "3.3.1";

     

       6
       6
        
         pname = "pytest";

     

       7
       7
        
       

     

       8
       8
        
         preCheck = ''

     
···

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";

     

       15
       15
       +
           sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         checkInputs = [ hypothesis ];

     

       19
       19
        
         buildInputs = [ setuptools_scm ];

     

       20
       20
       -
         propagatedBuildInputs = [ py setuptools ]

     

       20
       20
       +
         propagatedBuildInputs = [ attrs py setuptools six pluggy ]

     

       21
       21
       +
           ++ (stdenv.lib.optional (!isPy3k) funcsigs)

     

       21
       22
        
           ++ (stdenv.lib.optional isPy26 argparse);

     

       22
       23
        
       

     

       23
       24
        
         meta = with stdenv.lib; {

     

       24
       25
        
           maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];

     

       25
       26
        
           platforms = platforms.unix;

     

       27
       27
       +
           description = "Framework for writing tests";

     

       26
       28
        
         };

     

       27
       29
        
       }

+14 -14

pkgs/development/python-modules/python-fuse/default.nix

···

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
       -
           baseName = "fuse";

     

       11
       11
       -
           version = "0.2.1";

     

       12
       12
       -
           name = "${baseName}-${version}";

     

       13
       13
       -
           disabled = isPy3k;

     

       10
       10
       +
         pname = "fuse";

     

       11
       11
       +
         version = "0.2.1";

     

       14
       12
        
       

     

       15
       15
       -
           src = fetchurl {

     

       16
       16
       -
             url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";

     

       17
       17
       -
             sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";

     

       18
       18
       -
           };

     

       13
       13
       +
         disabled = isPy3k;

     

       19
       14
        
       

     

       20
       20
       -
           nativeBuildInputs = [ pkgconfig ];

     

       21
       21
       -
           buildInputs = [ fuse ];

     

       15
       15
       +
         src = fetchurl {

     

       16
       16
       +
           url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";

     

       17
       17
       +
           sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";

     

       18
       18
       +
         };

     

       22
       19
        
       

     

       23
       23
       -
           meta = {

     

       24
       24
       -
             description = "Python bindings for FUSE";

     

       25
       25
       -
             license = lib.licenses.lgpl21;

     

       26
       26
       -
           };

     

       20
       20
       +
         nativeBuildInputs = [ pkgconfig ];

     

       21
       21
       +
         buildInputs = [ fuse ];

     

       22
       22
       +
       

     

       23
       23
       +
         meta = {

     

       24
       24
       +
           description = "Python bindings for FUSE";

     

       25
       25
       +
           license = lib.licenses.lgpl21;

     

       26
       26
       +
         };

     

       27
       27
        
       }

+10 -6

pkgs/development/python-modules/pytoml/default.nix

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchgit

     

       2
       2
       -
       , python }:

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchgit

     

       4
       4
       +
       , python

     

       5
       5
       +
       }:

     

       3
       6
        
       

     

       4
       7
        
       buildPythonPackage rec {

     

       5
       8
        
         pname = "pytoml";

     

       6
       6
       -
         version = "0.1.11";

     

       7
       7
       -
         name = "${pname}-${version}";

     

       9
       9
       +
         version = "0.1.14";

     

       8
       10
        
       

     

       9
       9
       -
         checkPhase = "${python.interpreter} test/test.py";

     

       11
       11
       +
         checkPhase = ''

     

       12
       12
       +
           ${python.interpreter} test/test.py

     

       13
       13
       +
         '';

     

       10
       14
        
       

     

       11
       15
        
         # fetchgit used to ensure test submodule is available

     

       12
       16
        
         src = fetchgit {

     

       13
       17
        
           url = "${meta.homepage}.git";

     

       14
       18
        
           rev = "refs/tags/v${version}";

     

       15
       15
       -
           sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j";

     

       19
       19
       +
           sha256 = "1ip71yqxnyi4jhw5x1q7a0za61ndhpfh0vbx08jfv0w4ayng6rgv";

     

       16
       20
        
         };

     

       17
       21
        
       

     

       18
       22
        
         meta = with stdenv.lib; {

+39

pkgs/development/python-modules/pytools/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , decorator

     

       5
       5
       +
       , appdirs

     

       6
       6
       +
       , six

     

       7
       7
       +
       , numpy

     

       8
       8
       +
       , pytest

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "pytools";

     

       13
       13
       +
         version = "2017.6";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchPypi {

     

       16
       16
       +
           inherit pname version;

     

       17
       17
       +
           sha256 = "80f1bba4469d473c1b3969bc8e188c03bcc94d35807a889ceebbfc78e3208115";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         checkInputs = [ pytest ];

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           decorator

     

       24
       24
       +
           appdirs

     

       25
       25
       +
           six

     

       26
       26
       +
           numpy

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         checkPhase = ''

     

       30
       30
       +
           py.test -k 'not test_persistent_dict'

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         meta = {

     

       34
       34
       +
           homepage = https://github.com/inducer/pytools/;

     

       35
       35
       +
           description = "Miscellaneous Python lifesavers.";

     

       36
       36
       +
           license = lib.licenses.mit;

     

       37
       37
       +
           maintainers = with lib.maintainers; [ artuuge ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+1 -1

pkgs/development/python-modules/pywbem/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
       -
         name  = "pywbem-${version}";

     

       7
       7
       +
         pname = "pywbem";

     

       8
       8
        
         version = "0.10.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

+2 -2

pkgs/development/python-modules/pywinrm/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "pywinrm";

     

       14
       14
       -
         version = "0.2.2";

     

       14
       14
       +
         version = "0.3.0";

     

       15
       15
        
         name = "${pname}-${version}";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h";

     

       19
       19
       +
           sha256 = "799fc3e33fec8684443adf5778860388289102ea4fa1458f1bf307d167855573";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [ mock pytest ];

+23

pkgs/development/python-modules/regex/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "regex";

     

       9
       9
       +
         version = "2017.12.12";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "ee069308c2757e565cc2b6f417ba5288e76cfe4c1764b6826063f4fbd53219d7";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         meta = {

     

       17
       17
       +
           description = "Alternative regular expression module, to replace re";

     

       18
       18
       +
           homepage = "https://bitbucket.org/mrabarnett/mrab-regex";

     

       19
       19
       +
           license = lib.licenses.psfl;

     

       20
       20
       +
           platforms = lib.platforms.linux;

     

       21
       21
       +
           maintainers = with lib.maintainers; [ abbradar ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+2 -2

pkgs/development/python-modules/relatorio/default.nix

···

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "relatorio";

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
       -
         version = "0.7.1";

     

       6
       6
       +
         version = "0.8.0";

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://pypi/r/relatorio/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "744f1e39313f037a0ab52a154338ece151d83e5442a9278db1f8ce450ce6c2cd";

     

       9
       9
       +
           sha256 = "bddf85d029c5c85a0f976d73907e14e4c3093065fe8527170c91abf0218546d9";

     

       10
       10
        
         };

     

       11
       11
        
         propagatedBuildInputs = [

     

       12
       12
        
           genshi

+2 -2

pkgs/development/python-modules/restview/default.nix

···

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "restview";

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
       -
         version = "2.7.0";

     

       13
       13
       +
         version = "2.8.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec";

     

       17
       17
       +
           sha256 = "5f6f1523228eab3269f59dd03ac560f7d370cd81df6fdbcb4914b5e6bd896a11";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ docutils readme_renderer pygments ];

+2 -2

pkgs/development/python-modules/robomachine/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "robomachine";

     

       5
       5
       -
         version = "0.6";

     

       5
       5
       +
         version = "0.8.0";

     

       6
       6
        
         name = pname + "-" + version;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz";

     

       10
       10
       -
           sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54";

     

       10
       10
       +
           sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [ pyparsing argparse robotframework ];

+7 -5

pkgs/development/python-modules/ropper/default.nix

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , capstone

     

       5
       5
        
       , filebytes

     

       6
       6
       -
       , pytest }:

     

       6
       6
       +
       , pytest

     

       7
       7
       +
       }:

     

       7
       8
        
       

     

       8
       9
        
       buildPythonApplication rec {

     

       9
       9
       -
         name = "${pname}-${version}";

     

       10
       10
        
         pname = "ropper";

     

       11
       11
       -
         version = "1.10.10";

     

       11
       11
       +
         version = "1.11.2";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";

     

       15
       15
       +
           sha256 = "2183feedfe8b01a27301eee07383b481ece01b2319bdba3afebe33e19ca14aa3";

     

       16
       16
        
         };

     

       17
       17
        
         # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise

     

       18
       18
        
         # workaround: sudo chmod 777 /dev/shm

     

       19
       19
        
         checkPhase = ''

     

       20
       20
        
           py.test testcases

     

       21
       21
        
         '';

     

       22
       22
       -
         buildInputs = [pytest];

     

       22
       22
       +
         doCheck = false; # Tests not included in archive

     

       23
       23
       +
       

     

       24
       24
       +
         checkInputs = [pytest];

     

       23
       25
        
         propagatedBuildInputs = [ capstone filebytes ];

     

       24
       26
        
         meta = with stdenv.lib; {

     

       25
       27
        
           homepage = https://scoding.de/ropper/;

+2 -2

pkgs/development/python-modules/scrapy/default.nix

···

       2
       2
        
         testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,

     

       3
       3
        
         service-identity, parsel, pydispatcher, cssselect, lib }:

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
       -
           version = "1.4.0";

     

       5
       5
       +
           version = "1.5.0";

     

       6
       6
        
           pname = "Scrapy";

     

       7
       7
        
           name = "${pname}-${version}";

     

       8
       8
        
       

     
···

       26
       26
        
       

     

       27
       27
        
           src = fetchurl {

     

       28
       28
        
             url = "mirror://pypi/S/Scrapy/${name}.tar.gz";

     

       29
       29
       -
             sha256 = "04a08f027eef5d271342a016439533c81ba46f14bfcf230fecf602e99beaf233";

     

       29
       29
       +
             sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755";

     

       30
       30
        
           };

     

       31
       31
        
       

     

       32
       32
        
           meta = with lib; {

+2 -2

pkgs/development/python-modules/seaborn/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "seaborn";

     

       11
       11
       -
         version = "0.7.1";

     

       11
       11
       +
         version = "0.8.1";

     

       12
       12
        
         name = "${pname}-${version}";

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs";

     

       15
       15
       +
           sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         checkInputs = [ nose ];

+2 -2

pkgs/development/python-modules/serpy/default.nix

···

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "serpy";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
       -
         version = "0.2.0";

     

       8
       8
       +
         version = "0.3.1";

     

       9
       9
        
       

     

       10
       10
        
         meta = {

     

       11
       11
        
           description = "ridiculously fast object serialization";

     
···

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "7e62e242321b208362966d5ab32b45df93b1cb88da4ce6260277da060b4f7475";

     

       18
       18
       +
           sha256 = "3772b2a9923fbf674000ff51abebf6ea8f0fca0a2cfcbfa0d63ff118193d1ec5";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ flake8 py pyflakes tox ];

+2 -2

pkgs/development/python-modules/setuptools/default.nix

···

       8
       8
        
       # Should use buildPythonPackage here somehow

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "setuptools";

     

       11
       11
       -
         version = "38.2.3";

     

       11
       11
       +
         version = "38.2.5";

     

       12
       12
        
         name = "${python.libPrefix}-${pname}-${version}";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
        
           extension = "zip";

     

       17
       17
       -
           sha256 = "124jlg72bbk2xxv5wqbwcl4h5cdslslzk92rxjxiplg79l499hv3";

     

       17
       17
       +
           sha256 = "b080f276cc868670540b2c03cee06cc14d2faf9da7bec0f15058d1b402c94507";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [ python wrapPython unzip ];

+2 -2

pkgs/development/python-modules/shapely/default.nix

···

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
         pname = "Shapely";

     

       9
       9
       -
         version = "1.6.2.post1";

     

       9
       9
       +
         version = "1.6.3";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "07fba518e76b3276558f62a5829bdfa476f790cdef752383ccdc8c66b04b0899";

     

       13
       13
       +
           sha256 = "14152f111c7711fc6756fd538ec12fc8cdde7419f869b244922f71f61b2a6c6b";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ geos glibcLocales cython ];

+2 -2

pkgs/development/python-modules/simplejson/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "simplejson";

     

       9
       9
       -
         version = "3.11.1";

     

       9
       9
       +
         version = "3.13.2";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
         doCheck = !stdenv.isDarwin;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7";

     

       15
       15
       +
           sha256 = "4c4ecf20e054716cc1e5a81cadc44d3f4027108d8dd0861d8b1e3bd7a32d4f0a";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         meta = {

+3

pkgs/development/python-modules/six/default.nix

···

       19
       19
        
           py.test test_six.py

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
       +
         # To prevent infinite recursion with pytest

     

       23
       23
       +
         doCheck = false;

     

       24
       24
       +
       

     

       22
       25
        
         meta = {

     

       23
       26
        
           description = "A Python 2 and 3 compatibility library";

     

       24
       27
        
           homepage = https://pypi.python.org/pypi/six/;

+2 -2

pkgs/development/python-modules/smart_open/default.nix

···

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "smart_open";

     

       14
       14
        
         name = "${pname}-${version}";

     

       15
       15
       -
         version = "1.5.3";

     

       15
       15
       +
         version = "1.5.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "0m5j71f7f36s17v4mwv0bxg4azknvcy82rbjp28b4vifrjd6dm7s";

     

       19
       19
       +
           sha256 = "8fd2de1c359bd0074bd6d334a5b9820ae1c5b6ba563970b95052bace4b71baeb";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [ boto bz2file requests responses moto ];

+3 -14

pkgs/development/python-modules/spacy/default.nix

···

       19
       19
        
       , ftfy

     

       20
       20
        
       , thinc

     

       21
       21
        
       , pip

     

       22
       22
       +
       , regex

     

       22
       23
        
       }:

     

       23
       23
       -
       let

     

       24
       24
       -
         enableDebugging = true;

     

       25
       25
       -
         regexLocked = buildPythonPackage rec {

     

       26
       26
       -
           name = "${pname}-${version}";

     

       27
       27
       -
           pname = "regex";

     

       28
       28
       -
           version = "2017.04.05";

     

       29
       24
        
       

     

       30
       30
       -
           src = fetchPypi {

     

       31
       31
       -
             inherit pname version;

     

       32
       32
       -
             sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq";

     

       33
       33
       -
           };

     

       34
       34
       -
         };

     

       35
       35
       -
       in buildPythonPackage rec {

     

       25
       25
       +
       buildPythonPackage rec {

     

       36
       26
        
         pname = "spacy";

     

       37
       27
        
         version = "1.8.2";

     

       38
       38
       -
         name = pname + "-" + version;

     

       39
       28
        
       

     

       40
       29
        
         src = fetchFromGitHub {

     

       41
       30
        
           owner = "explosion";

     
···

       56
       45
        
          ujson

     

       57
       46
        
          dill

     

       58
       47
        
          requests

     

       59
       59
       -
          regexLocked

     

       48
       48
       +
          regex

     

       60
       49
        
          ftfy

     

       61
       50
        
          thinc

     

       62
       51
        
          pytest

+30

pkgs/development/python-modules/splinter/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , selenium

     

       5
       5
       +
       , flask

     

       6
       6
       +
       , coverage

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "splinter";

     

       11
       11
       +
         version = "0.7.7";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           sha256 = "f97119f84d339067169451d56043f37f6b0a504a17a7ac6e48c91c012be72af6";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = [ selenium ];

     

       19
       19
       +
       

     

       20
       20
       +
         checkInputs = [ flask coverage ];

     

       21
       21
       +
       

     

       22
       22
       +
         # No tests included

     

       23
       23
       +
         doCheck = false;

     

       24
       24
       +
       

     

       25
       25
       +
         meta = {

     

       26
       26
       +
           description = "Browser abstraction for web acceptance testing";

     

       27
       27
       +
           homepage = https://github.com/cobrateam/splinter;

     

       28
       28
       +
           license = lib.licenses.bsd3;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+2 -2

pkgs/development/python-modules/sqlalchemy/default.nix

···

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "SQLAlchemy";

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
       -
         version = "1.1.15";

     

       14
       14
       +
         version = "1.2.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a";

     

       18
       18
       +
           sha256 = "7dda3e0b1b12215e3bb05368d1abbf7d747112a43738e0a4e6deb466b83fd88e";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         checkInputs = [

+2 -2

pkgs/development/python-modules/sqlmap/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "sqlmap";

     

       8
       8
       -
         version = "1.1.11";

     

       8
       8
       +
         version = "1.1.12";

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "bb5297df9cd97316b3c7ca64f8e31cae5cc6b94c015afd84c546877f1f77d6e4";

     

       13
       13
       +
           sha256 = "86a1078ceb1e79f891633c7e4c7b07949fd9135a0e4c0738abd5111e2e6b96c0";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # No tests in archive

+2 -2

pkgs/development/python-modules/stevedore/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "stevedore";

     

       5
       5
       -
         version = "1.27.1";

     

       5
       5
       +
         version = "1.28.0";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0";

     

       10
       10
       +
           sha256 = "f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         doCheck = false;

+2 -2

pkgs/development/python-modules/stripe/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "stripe";

     

       6
       6
       -
         version = "1.70.0";

     

       6
       6
       +
         version = "1.77.0";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         # Tests require network connectivity and there's no easy way to disable

     
···

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "ee77103d2d18fe6369f23c40c93067425c5ed67e08b1a7678e681217e8fa8062";

     

       15
       15
       +
           sha256 = "6503851d2309dd9c1307e3f0a1cb33ac1427fee25d38ecba1f8bf73a0d74defc";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [ unittest2 mock ];

+32

pkgs/development/python-modules/structlog/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytest

     

       5
       5
       +
       , pretend

     

       6
       6
       +
       , freezegun

     

       7
       7
       +
       , simplejson

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "structlog";

     

       12
       12
       +
         version = "17.2.0";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchPypi {

     

       15
       15
       +
           inherit pname version;

     

       16
       16
       +
           sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         checkInputs = [ pytest pretend freezegun ];

     

       20
       20
       +
         propagatedBuildInputs = [ simplejson ];

     

       21
       21
       +
       

     

       22
       22
       +
         checkPhase = ''

     

       23
       23
       +
           rm tests/test_twisted.py*

     

       24
       24
       +
           py.test

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         meta = {

     

       28
       28
       +
           description = "Painless structural logging";

     

       29
       29
       +
           homepage = http://www.structlog.org/;

     

       30
       30
       +
           license = lib.licenses.asl20;

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+2 -2

pkgs/development/python-modules/supervise_api/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "supervise_api";

     

       9
       9
       -
         version = "0.1.5";

     

       9
       9
       +
         version = "0.2.0";

     

       10
       10
        
       

     

       11
       11
        
         name = "${pname}-${version}";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "1pqqlw80cjdgrlpvdmydkyhsrr4s531mn6bfkshm68j9gk4kq6px";

     

       15
       15
       +
           sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ supervise ];

+2 -2

pkgs/development/python-modules/sybil/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildPythonApplication rec {

     

       5
       5
        
         pname   = "sybil";

     

       6
       6
       -
         version = "1.0.5";

     

       6
       6
       +
         version = "1.0.6";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0x8qd5p5qliv8wmdglda2iy3f70i4jg8zqyk8yhklm5hrxm8jdl6";

     

       10
       10
       +
           sha256 = "5bd7dd09eff68cbec9062e6950124fadfaaccbc0f50b23c1037f4d70ae86f0f1";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         checkInputs = [ pytest nose ];

+2 -2

pkgs/development/python-modules/tabulate/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
       -
         version = "0.7.7";

     

       8
       8
       +
         version = "0.8.2";

     

       9
       9
        
         pname = "tabulate";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6";

     

       14
       14
       +
           sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         checkInputs = [ nose ];

+8 -4

pkgs/development/python-modules/testtools/default.nix

···

       12
       12
        
       , pyrsistent

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
       -
       # testtools 2.0.0 and up has a circular run-time dependency on futures

     

       15
       15
       +
       

     

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "testtools";

     

       19
       19
       -
         version = "1.9.0";

     

       20
       20
       -
         name = "${pname}-${version}";

     

       19
       19
       +
         version = "2.3.0";

     

       21
       20
        
       

     

       22
       21
        
         # Python 2 only judging from SyntaxError

     

       23
       22
        
       #   disabled = isPy3k;

     

       24
       23
        
       

     

       25
       24
        
         src = fetchPypi {

     

       26
       25
        
           inherit pname version;

     

       27
       27
       -
           sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644";

     

       26
       26
       +
           sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559";

     

       28
       27
        
         };

     

       29
       28
        
       

     

       30
       29
        
         propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ];

     
···

       32
       31
        
       

     

       33
       32
        
         # No tests in archive

     

       34
       33
        
         doCheck = false;

     

       34
       34
       +
       

     

       35
       35
       +
         # testtools 2.0.0 and up has a circular run-time dependency on futures

     

       36
       36
       +
         postPatch = ''

     

       37
       37
       +
           substituteInPlace requirements.txt --replace "fixtures>=1.3.0" ""

     

       38
       38
       +
         '';

     

       35
       39
        
       

     

       36
       40
        
         meta = {

     

       37
       41
        
           description = "A set of extensions to the Python standard library's unit testing framework";

+2 -2

pkgs/development/python-modules/textacy/default.nix

···

       25
       25
        
       buildPythonPackage rec {

     

       26
       26
        
         name = "${pname}-${version}";

     

       27
       27
        
         pname = "textacy";

     

       28
       28
       -
         version = "0.4.1";

     

       28
       28
       +
         version = "0.5.0";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchPypi {

     

       31
       31
        
           inherit pname version;

     

       32
       32
       -
           sha256 = "04wf3a7zgzz83nmgkh488wkl50zm9yfdpv3sl12sm2zj685plqcz";

     

       32
       32
       +
           sha256 = "6fc4603fd52c386081b063ef7aa15ca77e5e937a3064b197359659fccfdeb406";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         disabled = isPy27; # 2.7 requires backports.csv

+20

pkgs/development/python-modules/texttable/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "texttable";

     

       8
       8
       +
         version = "1.1.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchPypi {

     

       11
       11
       +
           inherit pname version;

     

       12
       12
       +
           sha256 = "44674d1d470a9fc264c4d1eba44b74463ca0066d7b954453dd5a4f8057779c9c";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         meta = {

     

       16
       16
       +
           description = "A module to generate a formatted text table, using ASCII characters";

     

       17
       17
       +
           homepage = http://foutaise.org/code/;

     

       18
       18
       +
           license = lib.licenses.lgpl2;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+2 -2

pkgs/development/python-modules/thespian/default.nix

···

       1
       1
        
       { stdenv, fetchPypi, buildPythonPackage, lib }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         version = "3.8.3";

     

       4
       4
       +
         version = "3.9.0";

     

       5
       5
        
         pname = "thespian";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
        
           extension = "zip";

     

       11
       11
       -
           sha256 = "0vvwsh3waxd5ldrayr86kdcshv07bp361fl7p16g9i044vklwly4";

     

       11
       11
       +
           sha256 = "e698e3c5369d7b06de5c4ce7b877ea65991c99f7b0fabd09f29e91bc981c7d22";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # Do not run the test suite: it takes a long type and uses

+2 -2

pkgs/development/python-modules/toolz/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec{

     

       8
       8
        
         pname = "toolz";

     

       9
       9
       -
         version = "0.8.2";

     

       9
       9
       +
         version = "0.9.0";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa";

     

       14
       14
       +
           sha256 = "929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         checkInputs = [ nose ];

+24

pkgs/development/python-modules/tox/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , py

     

       5
       5
       +
       , virtualenv

     

       6
       6
       +
       , pluggy

     

       7
       7
       +
       , setuptools_scm

     

       8
       8
       +
       , six

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "tox";

     

       13
       13
       +
         version = "2.9.1";

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ setuptools_scm ];

     

       16
       16
       +
         propagatedBuildInputs = [ py virtualenv pluggy six ];

     

       17
       17
       +
       

     

       18
       18
       +
         doCheck = false;

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchPypi {

     

       21
       21
       +
           inherit pname version;

     

       22
       22
       +
           sha256 = "752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8";

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+2 -2

pkgs/development/python-modules/tqdm/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "tqdm";

     

       14
       14
       -
         version = "4.19.4";

     

       14
       14
       +
         version = "4.19.5";

     

       15
       15
        
         name = "${pname}-${version}";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "7ca803c2ea268c6bdb541e2dac74a3af23cf4bf7b4132a6a78926d255f8c8df1";

     

       19
       19
       +
           sha256 = "df32e6f127dc0ccbc675eadb33f749abbcb8f174c5cb9ec49c0cdb73aa737377";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [ nose coverage glibcLocales flake8 ];

+2 -2

pkgs/development/python-modules/tzlocal/default.nix

···

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
        
         pname = "tzlocal";

     

       7
       7
       -
         version = "1.4";

     

       7
       7
       +
         version = "1.5.1";

     

       8
       8
        
       

     

       9
       9
        
         propagatedBuildInputs = [ pytz ];

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "0n9hw4kqblyc0avzwi26rqmvyk9impb608rvy11qifmigy7r18h5";

     

       13
       13
       +
           sha256 = "4ebeb848845ac898da6519b9b31879cf13b6626f7184c496037b818e238f2c4e";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # test fail (timezone test fail)

+2 -2

pkgs/development/python-modules/vowpalwabbit/default.nix

···

       3
       3
        
       pythonPackages.buildPythonPackage rec {

     

       4
       4
        
         pname = "vowpalwabbit";

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
       -
         version = "8.3.2";

     

       6
       6
       +
         version = "8.4.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl{

     

       9
       9
        
           url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz";

     

       10
       10
       -
           sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7";

     

       10
       10
       +
           sha256 = "abd22bfae99fb102cf8a6aec49e8c278cb7317d3a7eb60f70cd102be9c336fd5";

     

       11
       11
        
         };

     

       12
       12
        
         # vw tries to write some explicit things to home

     

       13
       13
        
         # python installed: The directory '/homeless-shelter/.cache/pip/http'

+2 -2

pkgs/development/python-modules/websockets/default.nix

···

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         pname = "websockets";

     

       9
       9
       -
         version = "3.4";

     

       9
       9
       +
         version = "4.0.1";

     

       10
       10
        
       in buildPythonPackage rec {

     

       11
       11
        
         name = "${pname}-${version}";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";

     

       15
       15
       -
           sha256 = "43e5b9f51dd0000a4c6f646e2ade0c886bd14a784ffac08b9e079bd17a63bcc5";

     

       15
       15
       +
           sha256 = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.3";

+8 -6

pkgs/development/python-modules/werkzeug/default.nix

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , itsdangerous

     

       2
       2
       +
       , itsdangerous, hypothesis

     

       3
       3
        
       , pytest, requests, glibcLocales }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
         pname = "Werkzeug";

     

       8
       8
       -
         version = "0.12.2";

     

       8
       8
       +
         version = "0.14.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "09mv4cya3lywkn4mi3qrqmjgwiw99kdk03dk912j8da6ny3pnflh";

     

       12
       12
       +
           sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         LC_ALL = "en_US.UTF-8";

     

       15
       15
       +
         propagatedBuildInputs = [ itsdangerous ];

     

       16
       16
       +
         checkInputs = [ pytest requests glibcLocales hypothesis ];

     

       16
       17
        
       

     

       17
       17
       -
         propagatedBuildInputs = [ itsdangerous ];

     

       18
       18
       -
         buildInputs = [ pytest requests glibcLocales ];

     

       18
       18
       +
         checkPhase = ''

     

       19
       19
       +
           LC_ALL="en_US.UTF-8" py.test

     

       20
       20
       +
         '';

     

       19
       21
        
       

     

       20
       22
        
         meta = with stdenv.lib; {

     

       21
       23
        
           homepage = http://werkzeug.pocoo.org/;

+2 -2

pkgs/development/python-modules/widgetsnbextension/default.nix

···

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "widgetsnbextension";

     

       10
       10
        
         name = "${pname}-${version}";

     

       11
       11
       -
         version = "3.0.8";

     

       11
       11
       +
         version = "3.1.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "a57e29e733b989e68fdd0f3d6927a3691763b39792591d573b95a89a5a12ec15";

     

       15
       15
       +
           sha256 = "67fc28c3b9fede955d69bccbd92784e3f0c6d0dee3a71532cd3367c257feb178";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ notebook ];

+2 -2

pkgs/development/python-modules/ws4py/default.nix

···

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         name = "${pname}-${version}";

     

       6
       6
        
         pname = "ws4py";

     

       7
       7
       -
         version = "0.4.2";

     

       7
       7
       +
         version = "0.4.3";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks";

     

       11
       11
       +
           sha256 = "ee12b58384bab8bfdcd1c76dcd6852047aec163af17175fc0f73e255d107dd7a";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         checkInputs = [ pytest mock git ];

+6 -13

pkgs/development/python-modules/xarray/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "xarray";

     

       13
       13
       -
         version = "0.9.6";

     

       14
       14
       -
         name = "${pname}-${version}";

     

       13
       13
       +
         version = "0.10.0";

     

       15
       14
        
       

     

       16
       15
        
         src = fetchPypi {

     

       17
       16
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494";

     

       17
       17
       +
           sha256 = "af1449e8df84a6eb09eb1d56c1dc5ac7f24a9563d4f2b9391ff364dc0c62344c";

     

       19
       18
        
         };

     

       20
       19
        
       

     

       21
       21
       -
         # Temporary patch until next release (later than 0.9.6) to fix

     

       22
       22
       -
         # a broken test case.

     

       23
       23
       -
         patches = [

     

       24
       24
       -
           (fetchurl {

     

       25
       25
       -
             url = "https://github.com/pydata/xarray/commit/726c6a3638ecf95889c541d84e892a106c2f2f92.patch";

     

       26
       26
       -
             sha256 = "1i2hsj5v5qlvqfj48vyn9931yndsf4k4wrk3qpqpywh32s7r007b";

     

       27
       27
       -
           })

     

       28
       28
       -
         ];

     

       29
       29
       -
       

     

       30
       30
       -
         buildInputs = [ pytest ];

     

       20
       20
       +
         checkInputs = [ pytest ];

     

       31
       21
        
         propagatedBuildInputs = [numpy pandas];

     

       32
       22
        
       

     

       33
       23
        
         checkPhase = ''

     

       34
       24
        
           py.test $out/${python.sitePackages}

     

       35
       25
        
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         # There always seem to be broken tests...

     

       28
       28
       +
         doCheck = false;

     

       36
       29
        
       

     

       37
       30
        
         meta = {

     

       38
       31
        
           description = "N-D labeled arrays and datasets in Python";

+2 -2

pkgs/development/python-modules/yapf/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "yapf";

     

       5
       5
       -
         version = "0.19.0";

     

       5
       5
       +
         version = "0.20.0";

     

       6
       6
        
         name = "${pname}-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "701b076a4916e3cfbba345e0297dcd54a02fd0fdcae1f43346f8a043c3bbd052";

     

       10
       10
       +
           sha256 = "ff28f8839a9a105854a099026a33f4cbec8bd933554bfed658aec359bfc88ae8";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         meta = with stdenv.lib; {

+9 -10

pkgs/development/python-modules/yarl/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , fetchurl

     

       2
       2
       +
       , fetchPypi

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , multidict

     

       5
       5
        
       , pytestrunner

     

       6
       6
        
       , pytest

     

       7
       7
       +
       , idna

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       9
       -
       let

     

       10
       10
       +
       buildPythonPackage rec {

     

       10
       11
        
         pname = "yarl";

     

       11
       11
       -
         version = "0.13.0";

     

       12
       12
       -
       in buildPythonPackage rec {

     

       12
       12
       +
         version = "0.17.0";

     

       13
       13
        
         name = "${pname}-${version}";

     

       14
       14
       -
         src = fetchurl {

     

       15
       15
       -
           url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";

     

       16
       16
       -
           sha256 = "25fe681a982f2cec567df8abac7cbd2ac27016e4aec89193945cab0643bfdb42";

     

       14
       14
       +
         src = fetchPypi {

     

       15
       15
       +
           inherit pname version;

     

       16
       16
       +
           sha256 = "2e4e1aec650ad80e73e7063941cd8aadb48e72487ec680a093ad364cc61efe64";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         buildInputs = [ pytest pytestrunner ];

     

       20
       20
       -
         propagatedBuildInputs = [ multidict ];

     

       21
       21
       -
       

     

       19
       19
       +
         checkInputs = [ pytest pytestrunner ];

     

       20
       20
       +
         propagatedBuildInputs = [ multidict idna ];

     

       22
       21
        
       

     

       23
       22
        
         meta = {

     

       24
       23
        
           description = "Yet another URL library";

+27

pkgs/development/python-modules/zope_copy/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , zope_interface

     

       5
       5
       +
       , zope_location

     

       6
       6
       +
       , zope_schema

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "zope_copy";

     

       12
       12
       +
         version = "4.0.2";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchPypi {

     

       15
       15
       +
           inherit pname version;

     

       16
       16
       +
           extension = "zip";

     

       17
       17
       +
           sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         propagatedBuildInputs = [ zope_interface ];

     

       21
       21
       +
       

     

       22
       22
       +
         checkInputs = [ zope_location zope_schema ];

     

       23
       23
       +
       

     

       24
       24
       +
         meta = {

     

       25
       25
       +
           maintainers = with lib.maintainers; [ domenkozar ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+3 -3

pkgs/development/r-modules/default.nix

···

       320
       320
        
           rmatio = [ pkgs.zlib.dev ];

     

       321
       321
        
           Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];

     

       322
       322
        
           Rmpi = [ pkgs.openmpi ];

     

       323
       323
       -
           RMySQL = [ pkgs.zlib pkgs.mysql.lib pkgs.mariadb pkgs.openssl.dev ];

     

       323
       323
       +
           RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ];

     

       324
       324
        
           RNetCDF = [ pkgs.netcdf pkgs.udunits ];

     

       325
       325
        
           RODBCext = [ pkgs.libiodbc ];

     

       326
       326
        
           RODBC = [ pkgs.libiodbc ];

     
···

       798
       798
        
           });

     

       799
       799
        
       

     

       800
       800
        
           RMySQL = old.RMySQL.overrideDerivation (attrs: {

     

       801
       801
       -
             MYSQL_DIR="${pkgs.mysql.lib}";

     

       801
       801
       +
             MYSQL_DIR="${pkgs.mysql.connector-c}";

     

       802
       802
        
             preConfigure = ''

     

       803
       803
        
               patchShebangs configure

     

       804
       804
       -
               '';

     

       804
       804
       +
             '';

     

       805
       805
        
           });

     

       806
       806
        
       

     

       807
       807
        
           devEMF = old.devEMF.overrideDerivation (attrs: {

+3 -3

pkgs/development/ruby-modules/gem-config/default.nix

···

       109
       109
        
       

     

       110
       110
        
         gio2 = attrs: {

     

       111
       111
        
           nativeBuildInputs = [ pkgconfig ];

     

       112
       112
       -
           buildInputs = [ gtk2 pcre ];

     

       112
       112
       +
           buildInputs = [ gtk2 pcre gobjectIntrospection ];

     

       113
       113
        
         };

     

       114
       114
        
       

     

       115
       115
        
         gitlab-markup = attrs: { meta.priority = 1; };

     
···

       167
       167
        
         };

     

       168
       168
        
       

     

       169
       169
        
         mysql = attrs: {

     

       170
       170
       -
           buildInputs = [ mysql.lib zlib openssl ];

     

       170
       170
       +
           buildInputs = [ mysql.connector-c zlib openssl ];

     

       171
       171
        
         };

     

       172
       172
        
       

     

       173
       173
        
         mysql2 = attrs: {

     

       174
       174
       -
           buildInputs = [ mysql.lib zlib openssl ];

     

       174
       174
       +
           buildInputs = [ mysql.connector-c zlib openssl ];

     

       175
       175
        
         };

     

       176
       176
        
       

     

       177
       177
        
         ncursesw = attrs: {

+1 -5

pkgs/development/tools/build-managers/cmake/setup-hook.sh

···

       72
       72
        
           configurePhase=cmakeConfigurePhase

     

       73
       73
        
       fi

     

       74
       74
        
       

     

       75
       75
       -
       if [ -n "$crossConfig" ]; then

     

       76
       76
       -
           crossEnvHooks+=(addCMakeParams)

     

       77
       77
       -
       else

     

       78
       78
       -
           envHooks+=(addCMakeParams)

     

       79
       79
       -
       fi

     

       75
       75
       +
       addEnvHooks "$targetOffset" addCMakeParams

     

       80
       76
        
       

     

       81
       77
        
       makeCmakeFindLibs(){

     

       82
       78
        
         isystem_seen=

+2 -2

pkgs/development/tools/database/shmig/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub

     

       2
       2
        
       , withMySQL ? false, withPSQL ? false, withSQLite ? false

     

       3
       3
       -
       , mariadb, postgresql, sqlite, gawk, which

     

       3
       3
       +
       , mysql, postgresql, sqlite, gawk, which

     

       4
       4
        
       , lib

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       20
       20
        
           patchShebangs .

     

       21
       21
        
       

     

       22
       22
        
           substituteInPlace shmig \

     

       23
       23
       -
             --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb}/bin/mysql"}" \

     

       23
       23
       +
             --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \

     

       24
       24
        
             --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \

     

       25
       25
        
             --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \

     

       26
       26
        
             --replace "awk" "${gawk}/bin/awk" \

+1 -1

pkgs/development/tools/misc/automake/setup-hook.sh

···

       2
       2
        
           addToSearchPathWithCustomDelimiter : ACLOCAL_PATH $1/share/aclocal

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addAclocals)

     

       5
       5
       +
       addEnvHooks "$hostOffset" addAclocals

+14

pkgs/development/tools/misc/binutils/always-search-rpath.patch

···

       1
       1
       +
       diff --git a/ld/genscripts.sh b/ld/genscripts.sh

     

       2
       2
       +
       index b6940d376d..0feb1adfd0 100755

     

       3
       3
       +
       --- a/ld/genscripts.sh

     

       4
       4
       +
       +++ b/ld/genscripts.sh

     

       5
       5
       +
       @@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then

     

       6
       6
       +
          USE_LIBPATH=yes

     

       7
       7
       +
        fi

     

       8
       8
       +
        

     

       9
       9
       +
       +# TODO: why is this needed?

     

       10
       10
       +
       +USE_LIBPATH=yes

     

       11
       11
       +
       +

     

       12
       12
       +
        # Set the library search path, for libraries named by -lfoo.

     

       13
       13
       +
        # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used.

     

       14
       14
       +
        # Otherwise, the default is set here.

+11 -6

pkgs/development/tools/misc/binutils/default.nix

···

       53
       53
        
           # elf32-littlearm-vxworks in favor of the first.

     

       54
       54
        
           # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766

     

       55
       55
        
           ./disambiguate-arm-targets.patch

     

       56
       56
       +
       

     

       57
       57
       +
           # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's

     

       58
       58
       +
           # not clear why this behavior was decided upon but it has the unfortunate

     

       59
       59
       +
           # consequence that the linker will fail to find transitive dependencies of

     

       60
       60
       +
           # shared objects when cross-compiling. Consequently, we are forced to

     

       61
       61
       +
           # override this behavior, forcing ld to search DT_RPATH even when

     

       62
       62
       +
           # cross-compiling.

     

       63
       63
       +
           ./always-search-rpath.patch

     

       56
       64
        
         ];

     

       57
       65
        
       

     

       58
       66
        
         outputs = [ "out" "info" "man" ];

     

       59
       67
        
       

     

       60
       60
       -
         nativeBuildInputs = [ bison buildPackages.stdenv.cc ];

     

       68
       68
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       69
       69
       +
         nativeBuildInputs = [ bison ];

     

       61
       70
        
         buildInputs = [ zlib ];

     

       62
       71
        
       

     

       63
       72
        
         inherit noSysDirs;

     
···

       82
       91
        
           else "-static-libgcc";

     

       83
       92
        
       

     

       84
       93
        
         # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.

     

       85
       85
       -
         configurePlatforms =

     

       86
       86
       -
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       87
       87
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       88
       88
       -
           then []

     

       89
       89
       -
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       94
       94
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       90
       95
        
       

     

       91
       96
        
         configureFlags = [

     

       92
       97
        
           "--enable-targets=all" "--enable-64-bit-bfd"

+2 -2

pkgs/development/tools/misc/d-feet/default.nix

···

       1
       1
        
       { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3

     

       2
       2
       -
       , python3Packages, wrapGAppsHook, gnome3, libwnck3 }:

     

       2
       2
       +
       , python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         version = "${major}.13";

     
···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];

     

       17
       17
       -
         buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 ];

     

       17
       17
       +
         buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobjectIntrospection ];

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ];

     

       20
       20

+1 -5

pkgs/development/tools/misc/pkgconfig/setup-hook.sh

···

       3
       3
        
           addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig

     

       4
       4
        
       }

     

       5
       5
        
       

     

       6
       6
       -
       if test -n "$crossConfig"; then

     

       7
       7
       -
           crossEnvHooks+=(addPkgConfigPath)

     

       8
       8
       -
       else

     

       9
       9
       -
           envHooks+=(addPkgConfigPath)

     

       10
       10
       -
       fi

     

       6
       6
       +
       addEnvHooks "$targetOffset" addPkgConfigPath

+3 -3

pkgs/development/tools/misc/sysbench/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql,

     

       2
       2
       -
         libaio }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql

     

       2
       2
       +
       , libaio }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "sysbench-1.0.6";

     

       6
       6
        
       

     

       7
       7
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       8
       8
       -
         buildInputs = [ vim libmysql libaio ];

     

       8
       8
       +
         buildInputs = [ vim mysql.connector-c libaio ];

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "akopytov";

+1 -1

pkgs/development/tools/ocaml/findlib/default.nix

···

       40
       40
        
               fi

     

       41
       41
        
           }

     

       42
       42
        
       

     

       43
       43
       -
           envHooks+=(addOCamlPath)

     

       43
       43
       +
           addEnvHooks "$targetOffset" addOCamlPath

     

       44
       44
        
         '';

     

       45
       45
        
       

     

       46
       46
        
         meta = {

+3 -1

pkgs/development/tools/tora/default.nix

···

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase

     

       20
       20
       +
           boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         preConfigure = ''

     
···

       50
       50
        
           "-lecpg"

     

       51
       51
        
           "-lssl"

     

       52
       52
        
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ];

     

       53
       55
        
       

     

       54
       56
        
         postFixup = ''

     

       55
       57
        
           wrapProgram $out/bin/tora \

+1 -1

pkgs/development/web/nodejs/setup-hook.sh

···

       2
       2
        
           addToSearchPath NODE_PATH $1/lib/node_modules

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
       -
       envHooks+=(addNodePath)

     

       5
       5
       +
       addEnvHooks "$hostOffset" addNodePath

+3 -3

pkgs/games/zod/default.nix

···

       1
       1
        
       { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer

     

       2
       2
       -
       , libmysql, makeWrapper }:

     

       2
       2
       +
       , mysql, makeWrapper }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "zod-engine-2011-03-18";

     
···

       24
       24
        
           sourceRoot=`pwd`/src

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       -
         buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql makeWrapper ];

     

       27
       27
       +
         buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ];

     

       28
       28
        
       

     

       29
       29
       -
         NIX_LDFLAGS = "-L${stdenv.lib.getLib libmysql}/lib/mysql";

     

       29
       29
       +
         NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql";

     

       30
       30
        
       

     

       31
       31
        
         installPhase = ''

     

       32
       32
        
           mkdir -p $out/bin $out/share/zod

+1 -1

pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh

···

       39
       39
        
         export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks

     

       40
       40
        
       }

     

       41
       41
        
       

     

       42
       42
       -
       envHooks+=(useSystemCoreFoundationFramework)

     

       42
       42
       +
       addEnvHooks "$hostOffset" useSystemCoreFoundationFramework

+1 -1

pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh

···

       7
       7
        
         fi

     

       8
       8
        
       }

     

       9
       9
        
       

     

       10
       10
       -
       envHooks+=(noDeprecatedDeclarations)

     

       10
       10
       +
       addEnvHooks "$hostOffset" noDeprecatedDeclarations

+1 -1

pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix

···

       33
       33
        
           cc -I. -c res_send.c

     

       34
       34
        
           cc -I. -c res_sendsigned.c

     

       35
       35
        
           cc -I. -c res_update.c

     

       36
       36
       -
           cc -dynamiclib -install_name $out/lib/libresolv.9.dylib -o libresolv.9.dylib *.o

     

       36
       36
       +
           cc -dynamiclib -install_name $out/lib/libresolv.9.dylib -current_version 1.0.0 -compatibility_version 1.0.0 -o libresolv.9.dylib *.o

     

       37
       37
        
         '';

     

       38
       38
        
       

     

       39
       39
        
         installPhase = ''

+1 -1

pkgs/os-specific/linux/busybox/default.nix

···

       95
       95
        
           makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")

     

       96
       96
        
         '';

     

       97
       97
        
       

     

       98
       98
       -
         nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;

     

       98
       98
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       99
       99
        
       

     

       100
       100
        
         buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ];

     

       101
       101

+2 -1

pkgs/os-specific/linux/kernel-headers/4.4.nix

···

       24
       24
        
       

     

       25
       25
        
         # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.

     

       26
       26
        
         # We do this so we have a build->build, not build->host, C compiler.

     

       27
       27
       -
         nativeBuildInputs = [ buildPackages.stdenv.cc perl ];

     

       27
       27
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       28
       28
       +
         nativeBuildInputs = [ perl ];

     

       28
       29
        
       

     

       29
       30
        
         extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];

     

       30
       31

+7 -2

pkgs/servers/clickhouse/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zookeeper_mt, zstd }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools

     

       2
       2
       +
       , icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC

     

       3
       3
       +
       , zookeeper_mt, zstd }:

     

       2
       4
        
       

     

       3
       5
        
       stdenv.mkDerivation rec {

     

       4
       6
        
         name = "clickhouse-${version}";

     
···

       16
       18
        
       

     

       17
       19
        
         nativeBuildInputs = [ cmake libtool ];

     

       18
       20
        
       

     

       19
       19
       -
         buildInputs = [ boost double-conversion gperftools icu libmysql lz4 openssl poco re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd ];

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco

     

       23
       23
       +
           re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd

     

       24
       24
       +
         ];

     

       20
       25
        
       

     

       21
       26
        
         cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ];

     

       22
       27

+1 -1

pkgs/servers/computing/slurm/default.nix

···

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkgconfig libtool ];

     

       22
       22
        
         buildInputs = [

     

       23
       23
       -
           curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl

     

       23
       23
       +
           curl python munge perl pam openssl mysql.connector-c ncurses gtk2 lua hwloc numactl

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         configureFlags =

+2 -2

pkgs/servers/dns/powerdns/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig,

     

       2
       2
        
         boost, libyamlcpp, libsodium, sqlite, protobuf,

     

       3
       3
       -
         libmysql, postgresql, lua, openldap, geoip, curl

     

       3
       3
       +
         mysql57, postgresql, lua, openldap, geoip, curl

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig ];

     

       16
       16
       -
         buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ];

     

       16
       16
       +
         buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ];

     

       17
       17
        
       

     

       18
       18
        
         # nix destroy with-modules arguments, when using configureFlags

     

       19
       19
        
         preConfigure = ''

+3 -3

pkgs/servers/freeradius/default.nix

···

       13
       13
        
       , withMemcached ? false

     

       14
       14
        
       , hiredis

     

       15
       15
        
       , withRedis ? false

     

       16
       16
       -
       , libmysql

     

       16
       16
       +
       , mysql

     

       17
       17
        
       , withMysql ? false

     

       18
       18
        
       , json_c

     

       19
       19
        
       , withJson ? false

     
···

       29
       29
        
       assert withCap -> libcap != null;

     

       30
       30
        
       assert withMemcached -> libmemcached != null;

     

       31
       31
        
       assert withRedis -> hiredis != null;

     

       32
       32
       -
       assert withMysql -> libmysql != null;

     

       32
       32
       +
       assert withMysql -> mysql != null;

     

       33
       33
        
       assert withYubikey -> libyubikey != null;

     

       34
       34
        
       assert withCollectd -> collectd != null;

     

       35
       35
        
       

     
···

       56
       56
        
           ++ optional withCap libcap

     

       57
       57
        
           ++ optional withMemcached libmemcached

     

       58
       58
        
           ++ optional withRedis hiredis

     

       59
       59
       -
           ++ optional withMysql libmysql

     

       59
       59
       +
           ++ optional withMysql mysql.connector-c

     

       60
       60
        
           ++ optional withJson json_c

     

       61
       61
        
           ++ optional withYubikey libyubikey

     

       62
       62
        
           ++ optional withCollectd collectd;

-55

pkgs/servers/games/ghost-one/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, unzip, gmp, zlib, bzip2, boost, mysql }:

     

       2
       2
       -
       stdenv.mkDerivation rec {

     

       3
       3
       -
       

     

       4
       4
       -
         name = "ghost-one-${version}";

     

       5
       5
       -
         version = "1.7.265";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "http://www.maxdevlon.com/ghost/ghostone${version}.zip";

     

       9
       9
       -
           sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         buildInputs = [ unzip gmp zlib bzip2 boost mysql.client ];

     

       13
       13
       -
       

     

       14
       14
       -
         patchPhase = ''

     

       15
       15
       -
           substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \

     

       16
       16
       -
             "${stdenv.lib.getLib mysql.client}/lib/mysql"

     

       17
       17
       -
         '';

     

       18
       18
       -
       

     

       19
       19
       -
         buildPhase = ''

     

       20
       20
       -
           cd bncsutil/src/bncsutil

     

       21
       21
       -
           make

     

       22
       22
       -
           cd ../../../StormLib/stormlib/

     

       23
       23
       -
           make

     

       24
       24
       -
           mkdir -p $out/lib

     

       25
       25
       -
           cd ../..

     

       26
       26
       -
       #    cp bncsutil/src/bncsutil/libbncutil.so $out/lib

     

       27
       27
       -
       #    cp StormLib/stormlib/libStorm.so $out/lib

     

       28
       28
       -
           cd ghost

     

       29
       29
       -
           make

     

       30
       30
       -
           cd ..

     

       31
       31
       -
         '';

     

       32
       32
       -
       

     

       33
       33
       -
         installPhase = ''

     

       34
       34
       -
           mkdir -p $out/lib

     

       35
       35
       -
           cp bncsutil/src/bncsutil/libbncsutil.so $out/lib

     

       36
       36
       -
           cp StormLib/stormlib/libStorm.so $out/lib

     

       37
       37
       -
       

     

       38
       38
       -
           mkdir -p $out/bin

     

       39
       39
       -
           cp ghost/ghost++ $out/bin

     

       40
       40
       -
       

     

       41
       41
       -
           mkdir -p $out/share/ghost-one/languages

     

       42
       42
       -
           cp -r mapcfgs $out/share/ghost-one

     

       43
       43
       -
           cp Languages/*.cfg $out/share/ghost-one/languages

     

       44
       44
       -
           cp language.cfg $out/share/ghost-one/languages/English.cfg

     

       45
       45
       -
           cp ip-to-country.csv $out/share/ghost-one/

     

       46
       46
       -
         '';

     

       47
       47
       -
       

     

       48
       48
       -
         meta = with stdenv.lib; {

     

       49
       49
       -
           homepage = http://www.codelain.com/forum/;

     

       50
       50
       -
           description = "A Warcraft III: Reign of Chaos and Warcraft III: The Frozen Throne game hosting bot";

     

       51
       51
       -
           license = licenses.asl20;

     

       52
       52
       -
           maintainers = [ maintainers.phreedom ];

     

       53
       53
       -
           broken = true; # can't even get downloaded

     

       54
       54
       -
         };

     

       55
       55
       -
       }

+1 -1

pkgs/servers/http/lighttpd/default.nix

···

       19
       19
        
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
        
         buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ]

     

       21
       21
        
                    ++ stdenv.lib.optional enableMagnet lua5_1

     

       22
       22
       -
                    ++ stdenv.lib.optional enableMysql mysql.lib

     

       22
       22
       +
                    ++ stdenv.lib.optional enableMysql mysql.connector-c

     

       23
       23
        
                    ++ stdenv.lib.optional enableLdap openldap;

     

       24
       24
        
       

     

       25
       25
        
         configureFlags = [ "--with-openssl" ]

+2 -2

pkgs/servers/mail/dovecot/default.nix

···

       2
       2
        
       , bzip2, zlib, inotify-tools, pam, libcap

     

       3
       3
        
       , clucene_core_2, icu, openldap

     

       4
       4
        
       # Auth modules

     

       5
       5
       -
       , withMySQL ? false, libmysql

     

       5
       5
       +
       , withMySQL ? false, mysql

     

       6
       6
        
       , withPgSQL ? false, postgresql

     

       7
       7
        
       , withSQLite ? true, sqlite

     

       8
       8
        
       }:

     
···

       13
       13
        
         nativeBuildInputs = [ perl pkgconfig ];

     

       14
       14
        
         buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]

     

       15
       15
        
           ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]

     

       16
       16
       -
           ++ lib.optional withMySQL libmysql

     

       16
       16
       +
           ++ lib.optional withMySQL mysql.connector-c

     

       17
       17
        
           ++ lib.optional withPgSQL postgresql

     

       18
       18
        
           ++ lib.optional withSQLite sqlite;

     

       19
       19

+3 -3

pkgs/servers/mail/dspam/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, makeWrapper

     

       2
       2
        
       , gawk, gnused, gnugrep, coreutils, which

     

       3
       3
        
       , perl, NetSMTP

     

       4
       4
       -
       , withMySQL ? false, zlib, libmysql

     

       4
       4
       +
       , withMySQL ? false, zlib, mysql57

     

       5
       5
        
       , withPgSQL ? false, postgresql

     

       6
       6
        
       , withSQLite ? false, sqlite

     

       7
       7
        
       , withDB ? false, db

     
···

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         buildInputs = [ perl ]

     

       29
       29
       -
                       ++ lib.optionals withMySQL [ zlib libmysql ]

     

       29
       29
       +
                       ++ lib.optionals withMySQL [ zlib mysql57.connector-c ]

     

       30
       30
        
                       ++ lib.optional withPgSQL postgresql

     

       31
       31
        
                       ++ lib.optional withSQLite sqlite

     

       32
       32
        
                       ++ lib.optional withDB db;

     
···

       49
       49
        
           "--enable-preferences-extension"

     

       50
       50
        
           "--enable-long-usernames"

     

       51
       51
        
           "--enable-external-lookup"

     

       52
       52
       -
         ] ++ lib.optional withMySQL "--with-mysql-includes=${lib.getDev libmysql}/include/mysql"

     

       52
       52
       +
         ] ++ lib.optional withMySQL "--with-mysql-includes=${mysql57.connector-c}/include/mysql"

     

       53
       53
        
           ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib";

     

       54
       54
        
       

     

       55
       55
        
         # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR"

+6 -4

pkgs/servers/mail/opensmtpd/extras.nix

···

       1
       1
        
       { stdenv, fetchurl, openssl, libevent, libasr,

     

       2
       2
       -
         python2, pkgconfig, lua5, perl, mariadb, postgresql, sqlite, hiredis }:

     

       2
       2
       +
         python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis }:

     

       3
       3
       +
       

     

       3
       4
        
       stdenv.mkDerivation rec {

     

       4
       5
        
         name = "opensmtpd-extras-${version}";

     

       5
       6
        
         version = "5.7.1";

     
···

       11
       12
        
       

     

       12
       13
        
         nativeBuildInputs = [ pkgconfig ];

     

       13
       14
        
         buildInputs = [ openssl libevent

     

       14
       14
       -
           libasr python2 lua5 perl mariadb.client postgresql sqlite hiredis ];

     

       15
       15
       +
           libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];

     

       15
       16
        
       

     

       16
       17
        
         configureFlags = [

     

       17
       18
        
           "--sysconfdir=/etc"

     
···

       54
       55
        
           "--with-perl=${perl}"

     

       55
       56
        
           "--with-filter-perl"

     

       56
       57
        
       

     

       57
       57
       -
         ] ++ stdenv.lib.optional (mariadb != null) [

     

       58
       58
       +
         ] ++ stdenv.lib.optional (mysql != null) [

     

       58
       59
        
           "--with-table-mysql"

     

       59
       60
        
       

     

       60
       61
        
         ] ++ stdenv.lib.optional (postgresql != null) [

     
···

       67
       68
        
           "--with-table-redis"

     

       68
       69
        
         ];

     

       69
       70
        
       

     

       70
       70
       -
         NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) [ "-I${hiredis}/include/hiredis" ];

     

       71
       71
       +
         NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) "-I${hiredis}/include/hiredis" ++

     

       72
       72
       +
           stdenv.lib.optional (mysql != null) "-L${mysql.connector-c}/lib/mysql";

     

       71
       73
        
       

     

       72
       74
        
         meta = with stdenv.lib; {

     

       73
       75
        
           homepage = https://www.opensmtpd.org/;

+3 -3

pkgs/servers/mail/postfix/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl

     

       2
       2
        
       , coreutils, findutils, gnugrep, gawk, icu, pcre

     

       3
       3
        
       , withPgSQL ? false, postgresql

     

       4
       4
       -
       , withMySQL ? false, libmysql

     

       4
       4
       +
       , withMySQL ? false, mysql

     

       5
       5
        
       , withSQLite ? false, sqlite

     

       6
       6
        
       , withLDAP ? false, openldap

     

       7
       7
        
       }:

     
···

       11
       11
        
           "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"

     

       12
       12
        
           "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"

     

       13
       13
        
          ] ++ lib.optional withPgSQL "-DHAS_PGSQL"

     

       14
       14
       -
            ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ]

     

       14
       14
       +
            ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]

     

       15
       15
        
            ++ lib.optional withSQLite "-DHAS_SQLITE"

     

       16
       16
        
            ++ lib.optional withLDAP "-DHAS_LDAP");

     

       17
       17
        
          auxlibs = lib.concatStringsSep " " ([

     
···

       35
       35
        
         nativeBuildInputs = [ makeWrapper ];

     

       36
       36
        
         buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]

     

       37
       37
        
                       ++ lib.optional withPgSQL postgresql

     

       38
       38
       -
                       ++ lib.optional withMySQL libmysql

     

       38
       38
       +
                       ++ lib.optional withMySQL mysql.connector-c

     

       39
       39
        
                       ++ lib.optional withSQLite sqlite

     

       40
       40
        
                       ++ lib.optional withLDAP openldap;

     

       41
       41

+11

pkgs/servers/sql/mariadb/cmake-includedir.patch

···

       1
       1
       +
       --- a/include/CMakeLists.txt	2017-12-25 05:59:07.204144374 +0100

     

       2
       2
       +
       +++ b/include/CMakeLists.txt	2017-12-25 05:59:26.339552817 +0100

     

       3
       3
       +
       @@ -94,7 +94,7 @@

     

       4
       4
       +
        ENDIF()

     

       5
       5
       +
        

     

       6
       6
       +
        MACRO(INSTALL_COMPAT_HEADER file footer)

     

       7
       7
       +
       -  INSTALL(CODE "FILE(WRITE \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDEDIR}/${file}

     

       8
       8
       +
       +  INSTALL(CODE "FILE(WRITE ${INSTALL_INCLUDEDIR}/${file}

     

       9
       9
       +
        \"/* Do not edit this file directly, it was auto-generated by cmake */

     

       10
       10
       +
        

     

       11
       11
       +
        #warning This file should not be included by clients, include only <mysql.h>

+54 -20

pkgs/servers/sql/mariadb/default.nix

···

       11
       11
        
       mariadb = everything // {

     

       12
       12
        
         inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin

     

       13
       13
        
         server = everything; # a full single-output build, including everything in `client` again

     

       14
       14
       -
         lib = client; # compat. with the old mariadb split

     

       14
       14
       +
         inherit connector-c; # libmysqlclient.so

     

       15
       15
        
       };

     

       16
       16
        
       

     

       17
       17
        
       common = rec { # attributes common to both builds

     

       18
       18
       -
         version = "10.1.28";

     

       18
       18
       +
         version = "10.2.11";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchurl {

     

       21
       21
        
           url    = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";

     

       22
       22
       -
           sha256 = "1g9b0c04qhgcgw6xw29bvdjjjacr7kn82crc7apvvi10ykzwhb99";

     

       22
       22
       +
           sha256 = "1s53ravbrxcc8ixvkm56rwgs3cfifzngc56pidd1f1dr1n0mlmb3";

     

       23
       23
        
           name   = "mariadb-${version}.tar.gz";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         prePatch = ''

     

       27
       27
       -
           substituteInPlace cmake/libutils.cmake \

     

       28
       28
       -
             --replace /usr/bin/libtool libtool

     

       29
       29
       -
           sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       26
        
         nativeBuildInputs = [ cmake pkgconfig ];

     

       33
       27
        
       

     

       34
       28
        
         buildInputs = [

     

       35
       29
        
           ncurses openssl zlib pcre jemalloc

     

       36
       30
        
         ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]

     

       37
       31
        
           ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];

     

       32
       32
       +
       

     

       33
       33
       +
         prePatch = ''

     

       34
       34
       +
           sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         patches = [ ./cmake-includedir.patch ];

     

       38
       38
        
       

     

       39
       39
        
         cmakeFlags = [

     

       40
       40
        
           "-DBUILD_CONFIG=mysql_release"

     
···

       72
       72
        
           find "''${!outputBin}/bin" -name '*test*' -delete

     

       73
       73
        
         '';

     

       74
       74
        
       

     

       75
       75
       -
         passthru.mysqlVersion = "5.6";

     

       75
       75
       +
         passthru.mysqlVersion = "5.7";

     

       76
       76
        
       

     

       77
       77
        
         meta = with stdenv.lib; {

     

       78
       78
        
           description = "An enhanced, drop-in replacement for MySQL";

     
···

       82
       82
        
           platforms   = platforms.all;

     

       83
       83
        
         };

     

       84
       84
        
       };

     

       85
       85
       -
       

     

       86
       85
        
       

     

       87
       86
        
       client = stdenv.mkDerivation (common // {

     

       88
       87
        
         name = "mariadb-client-${common.version}";

     
···

       97
       96
        
       

     

       98
       97
        
         preConfigure = common.preConfigure + ''

     

       99
       98
        
           cmakeFlags="$cmakeFlags \

     

       100
       100
       -
             -DINSTALL_BINDIR=$bin/bin -DINSTALL_SCRIPTDIR=$bin/bin \

     

       99
       99
       +
             -DINSTALL_BINDIR=$bin/bin \

     

       100
       100
       +
             -DINSTALL_SCRIPTDIR=$bin/bin \

     

       101
       101
        
             -DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \

     

       102
       102
       -
             -DINSTALL_DOCDIR=$bin/share/doc/mysql -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \

     

       102
       102
       +
             -DINSTALL_DOCDIR=$bin/share/doc/mysql \

     

       103
       103
       +
             -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \

     

       103
       104
        
             "

     

       104
       105
        
         '';

     

       105
       106
        
       

     

       106
       107
        
         # prevent cycle; it needs to reference $dev

     

       107
       108
        
         postInstall = common.postInstall + ''

     

       108
       109
        
           moveToOutput bin/mysql_config "$dev"

     

       110
       110
       +
           moveToOutput bin/mariadb_config "$dev"

     

       109
       111
        
         '';

     

       110
       112
        
       

     

       111
       113
        
         enableParallelBuilding = true; # the client should be OK

     

       112
       114
        
       });

     

       113
       115
        
       

     

       114
       114
       -
       

     

       115
       116
        
       everything = stdenv.mkDerivation (common // {

     

       116
       117
        
         name = "mariadb-${common.version}";

     

       117
       118
        
       

     
···

       120
       121
        
         buildInputs = common.buildInputs ++ [

     

       121
       122
        
           xz lzo lz4 bzip2 snappy

     

       122
       123
        
           libxml2 boost judy libevent cracklib

     

       123
       123
       -
         ]

     

       124
       124
       -
           ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]

     

       125
       125
       -
           ;

     

       124
       124
       +
         ] ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ];

     

       126
       125
        
       

     

       127
       126
        
         cmakeFlags = common.cmakeFlags ++ [

     

       128
       127
        
           "-DMYSQL_DATADIR=/var/lib/mysql"

     
···

       155
       154
        
         postInstall = common.postInstall + ''

     

       156
       155
        
           rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data

     

       157
       156
        
           rm "$out"/share/man/man1/mysql-test-run.pl.1

     

       158
       158
       -
       

     

       159
       159
       -
           # Don't install mysqlbug to prevent a dependency on gcc.

     

       160
       160
       -
           rm $out/bin/mysqlbug

     

       157
       157
       +
           rm "$out"/bin/rcmysql

     

       161
       158
        
         '';

     

       159
       159
       +
       

     

       160
       160
       +
         CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";

     

       162
       161
        
       });

     

       162
       162
       +
       

     

       163
       163
       +
       connector-c = stdenv.mkDerivation rec {

     

       164
       164
       +
         name = "mariadb-connector-c-${version}";

     

       165
       165
       +
         version = "2.3.4";

     

       166
       166
       +
       

     

       167
       167
       +
         src = fetchurl {

     

       168
       168
       +
           url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";

     

       169
       169
       +
           sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb";

     

       170
       170
       +
           name   = "mariadb-connector-c-${version}-src.tar.gz";

     

       171
       171
       +
         };

     

       172
       172
       +
       

     

       173
       173
       +
         # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0

     

       174
       174
       +
         cmakeFlags = [

     

       175
       175
       +
           "-DWITH_EXTERNAL_ZLIB=ON"

     

       176
       176
       +
           "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"

     

       177
       177
       +
         ];

     

       178
       178
       +
       

     

       179
       179
       +
         nativeBuildInputs = [ cmake ];

     

       180
       180
       +
         propagatedBuildInputs = [ openssl zlib ];

     

       181
       181
       +
       

     

       182
       182
       +
         enableParallelBuilding = true;

     

       183
       183
       +
       

     

       184
       184
       +
         postFixup = ''

     

       185
       185
       +
           ln -sv mariadb_config $out/bin/mysql_config

     

       186
       186
       +
           ln -sv mariadb $out/lib/mysql

     

       187
       187
       +
           ln -sv mariadb $out/include/mysql

     

       188
       188
       +
         '';

     

       189
       189
       +
       

     

       190
       190
       +
         meta = with stdenv.lib; {

     

       191
       191
       +
           description = "Client library that can be used to connect to MySQL or MariaDB";

     

       192
       192
       +
           license = licenses.lgpl21;

     

       193
       193
       +
           maintainers = with maintainers; [ globin ];

     

       194
       194
       +
           platforms = platforms.all;

     

       195
       195
       +
         };

     

       196
       196
       +
       };

     

       163
       197
        
       

     

       164
       198
        
       in mariadb

+9 -3

pkgs/servers/sql/mysql/5.5.x.nix

···

       3
       3
        
       

     

       4
       4
        
       # Note: zlib is not required; MySQL can use an internal zlib.

     

       5
       5
        
       

     

       6
       6
       -
       stdenv.mkDerivation rec {

     

       6
       6
       +
       let

     

       7
       7
       +
       self = stdenv.mkDerivation rec {

     

       7
       8
        
         name = "mysql-${version}";

     

       8
       9
        
         version = "5.5.58";

     

       9
       10
        
       

     
···

       59
       60
        
           rm $out/share/man/man1/mysql-test-run.pl.1

     

       60
       61
        
         '';

     

       61
       62
        
       

     

       62
       62
       -
         passthru.mysqlVersion = "5.5";

     

       63
       63
       +
         passthru = {

     

       64
       64
       +
           client = self;

     

       65
       65
       +
           connector-c = self;

     

       66
       66
       +
           server = self;

     

       67
       67
       +
           mysqlVersion = "5.5";

     

       68
       68
       +
         };

     

       63
       69
        
       

     

       64
       70
        
         meta = {

     

       65
       71
        
           homepage = http://www.mysql.com/;

     

       66
       72
        
           description = "The world's most popular open source database";

     

       67
       73
        
           platforms = stdenv.lib.platforms.unix;

     

       68
       74
        
         };

     

       69
       69
       -
       }

     

       75
       75
       +
       }; in self

+20 -7

pkgs/servers/sql/mysql/5.7.x.nix

···

       3
       3
        
       

     

       4
       4
        
       # Note: zlib is not required; MySQL can use an internal zlib.

     

       5
       5
        
       

     

       6
       6
       -
       stdenv.mkDerivation rec {

     

       6
       6
       +
       let

     

       7
       7
       +
       self = stdenv.mkDerivation rec {

     

       7
       8
        
         name = "mysql-${version}";

     

       8
       9
        
         version = "5.7.20";

     

       9
       10
        
       

     
···

       22
       23
        
       

     

       23
       24
        
         enableParallelBuilding = true;

     

       24
       25
        
       

     

       26
       26
       +
         outputs = [ "out" "static" ];

     

       27
       27
       +
       

     

       25
       28
        
         cmakeFlags = [

     

       26
       29
        
           "-DWITH_SSL=yes"

     

       27
       27
       -
           "-DWITH_READLINE=yes"

     

       28
       30
        
           "-DWITH_EMBEDDED_SERVER=yes"

     

       31
       31
       +
           "-DWITH_UNITTEST=no"

     

       29
       32
        
           "-DWITH_ZLIB=yes"

     

       33
       33
       +
           "-DWITH_ARCHIVE_STORAGE_ENGINE=yes"

     

       34
       34
       +
           "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"

     

       35
       35
       +
           "-DWITH_FEDERATED_STORAGE_ENGINE=yes"

     

       36
       36
       +
           "-DCMAKE_VERBOSE_MAKEFILE=yes"

     

       30
       37
        
           "-DHAVE_IPV6=yes"

     

       31
       38
        
           "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"

     

       32
       39
        
           "-DMYSQL_DATADIR=/var/lib/mysql"

     

       33
       33
       -
           "-DINSTALL_SYSCONFDIR=etc/mysql"

     

       34
       40
        
           "-DINSTALL_INFODIR=share/mysql/docs"

     

       35
       41
        
           "-DINSTALL_MANDIR=share/man"

     

       36
       42
        
           "-DINSTALL_PLUGINDIR=lib/mysql/plugin"

     
···

       50
       56
        
         '';

     

       51
       57
        
         postInstall = ''

     

       52
       58
        
           sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db

     

       53
       53
       -
           rm -r $out/mysql-test "$out"/lib/*.a

     

       54
       54
       -
           rm $out/share/man/man1/mysql-test-run.pl.1

     

       59
       59
       +
           install -vD $out/lib/*.a -t $static/lib

     

       60
       60
       +
           rm -r $out/mysql-test

     

       61
       61
       +
           rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a

     

       62
       62
       +
           ln -s libmysqlclient.so $out/lib/libmysqlclient_r.so

     

       55
       63
        
         '';

     

       56
       64
        
       

     

       57
       57
       -
         passthru.mysqlVersion = "5.7";

     

       65
       65
       +
         passthru = {

     

       66
       66
       +
           client = self;

     

       67
       67
       +
           connector-c = self;

     

       68
       68
       +
           server = self;

     

       69
       69
       +
           mysqlVersion = "5.7";

     

       70
       70
       +
         };

     

       58
       71
        
       

     

       59
       72
        
         meta = {

     

       60
       73
        
           homepage = http://www.mysql.com/;

     

       61
       74
        
           description = "The world's most popular open source database";

     

       62
       75
        
           platforms = stdenv.lib.platforms.unix;

     

       63
       76
        
         };

     

       64
       64
       -
       }

     

       77
       77
       +
       }; in self

+1 -1

pkgs/servers/web-apps/frab/Gemfile.lock

···

       180
       180
        
             pry (~> 0.10)

     

       181
       181
        
           pry-rails (0.3.4)

     

       182
       182
        
             pry (>= 0.9.10)

     

       183
       183
       -
           puma (3.6.0)

     

       183
       183
       +
           puma (3.9.1)

     

       184
       184
        
           rack (1.6.4)

     

       185
       185
        
           rack-test (0.6.3)

     

       186
       186
        
             rack (>= 1.0)

+3 -3

pkgs/servers/web-apps/frab/gemset.nix

···

       628
       628
        
         puma = {

     

       629
       629
        
           source = {

     

       630
       630
        
             remotes = ["https://rubygems.org"];

     

       631
       631
       -
             sha256 = "1rmcny3jr1jj01f9fqijwmikj212a5iql7ghifklm77x4a8pp399";

     

       631
       631
       +
             sha256 = "1k13n500r7v480rcbxm7k09hip0zi7p8zvy3vajj8g9hb7gdcwnp";

     

       632
       632
        
             type = "gem";

     

       633
       633
        
           };

     

       634
       634
       -
           version = "3.6.0";

     

       634
       634
       +
           version = "3.9.1";

     

       635
       635
        
         };

     

       636
       636
        
         rack = {

     

       637
       637
        
           source = {

     
···

       929
       929
        
           };

     

       930
       930
        
           version = "0.9.5";

     

       931
       931
        
         };

     

       932
       932
       -
       }
     

       932
       932
       +
       }

+21 -12

pkgs/servers/web-apps/searx/default.nix

···

       1
       1
        
       { lib, pythonPackages, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       pythonPackages.buildPythonApplication rec {

     

       4
       4
       -
         name = "searx-${version}";

     

       5
       5
       -
         version = "0.12.0";

     

       6
       6
       -
         namePrefix = "";

     

       3
       3
       +
       with pythonPackages;

     

       4
       4
       +
       

     

       5
       5
       +
       buildPythonApplication rec {

     

       6
       6
       +
         pname = "searx";

     

       7
       7
       +
         version = "0.13.1";

     

       7
       8
        
       

     

       9
       9
       +
         # Can not use PyPI because certain test files are missing.

     

       8
       10
        
         src = fetchFromGitHub {

     

       9
       11
        
           owner = "asciimoo";

     

       10
       12
        
           repo = "searx";

     

       11
       13
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0";

     

       14
       14
       +
           sha256 = "0nizxq9ggf9g8f8pxn2hfm0kn20356v65h4cj9s73n742nkv6ani";

     

       13
       15
        
         };

     

       14
       16
        
       

     

       15
       17
        
         postPatch = ''

     

       16
       18
        
           substituteInPlace requirements.txt \

     

       17
       17
       -
             --replace 'certifi==2017.1.23' 'certifi' \

     

       18
       18
       -
             --replace 'lxml==3.7.3' 'lxml' \

     

       19
       19
       -
             --replace 'pyopenssl==16.2.0' 'pyopenssl' \

     

       19
       19
       +
             --replace 'certifi==2017.11.5' 'certifi' \

     

       20
       20
       +
             --replace 'flask==0.12.2' 'flask==0.12.*' \

     

       21
       21
       +
             --replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \

     

       22
       22
       +
             --replace 'lxml==4.1.1' 'lxml==4.1.*' \

     

       23
       23
       +
             --replace 'idna==2.5' 'idna' \

     

       20
       24
        
             --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \

     

       21
       21
       -
             --replace 'flask==0.12' 'flask==0.12.*' \

     

       22
       22
       -
             --replace 'requests[socks]==2.13.0' 'requests[socks]==2.*' \

     

       23
       23
       -
             --replace 'python-dateutil==2.6.0' 'python-dateutil==2.6.*'

     

       25
       25
       +
             --replace 'pyopenssl==17.4.0' 'pyopenssl' \

     

       26
       26
       +
             --replace 'python-dateutil==2.6.1' 'python-dateutil==2.6.*'

     

       24
       27
        
         '';

     

       25
       28
        
       

     

       26
       26
       -
         propagatedBuildInputs = with pythonPackages; [

     

       29
       29
       +
         propagatedBuildInputs = [

     

       27
       30
        
           pyyaml lxml grequests flaskbabel flask requests

     

       28
       31
        
           gevent speaklater Babel pytz dateutil pygments

     

       29
       32
        
           pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks

     

       30
       33
        
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         checkInputs = [ splinter mock plone-testing robotsuite unittest2 ];

     

       36
       36
       +
       

     

       37
       37
       +
         preCheck = ''

     

       38
       38
       +
           rm tests/test_robot.py # A variable that is imported is commented out

     

       39
       39
       +
         '';

     

       31
       40
        
       

     

       32
       41
        
         meta = with lib; {

     

       33
       42
        
           homepage = https://github.com/asciimoo/searx;

+1 -6

pkgs/servers/x11/xorg/builder.sh

···

       16
       16
        
       

     

       17
       17
        
           echo "propagating requisites $requires"

     

       18
       18
        
       

     

       19
       19
       -
           if test -n "$crossConfig"; then

     

       20
       20
       -
               local pkgs=("${crossPkgs[@]}")

     

       21
       21
       -
           else

     

       22
       22
       -
               local pkgs=("${nativePkgs[@]}")

     

       23
       23
       -
           fi

     

       24
       19
        
           for r in $requires; do

     

       25
       25
       -
               for p in "${pkgs[@]}"; do

     

       20
       20
       +
               for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do

     

       26
       21
        
                   if test -e $p/lib/pkgconfig/$r.pc; then

     

       27
       22
        
                       echo "  found requisite $r in $p"

     

       28
       23
        
                       propagatedBuildInputs+=" $p"

+3 -3

pkgs/servers/x11/xorg/default.nix

···

       2588
       2588
        
         }) // {inherit ;};

     

       2589
       2589
        
       

     

       2590
       2590
        
         xorgserver = (mkDerivation "xorgserver" {

     

       2591
       2591
       -
           name = "xorg-server-1.19.5";

     

       2591
       2591
       +
           name = "xorg-server-1.19.6";

     

       2592
       2592
        
           builder = ./builder.sh;

     

       2593
       2593
        
           src = fetchurl {

     

       2594
       2594
       -
             url = mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2;

     

       2595
       2595
       -
             sha256 = "0iql4pgsgpyqcrd3256pv227cdadvz01ych61n0d41ixp67gmzqq";

     

       2594
       2594
       +
             url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2;

     

       2595
       2595
       +
             sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7";

     

       2596
       2596
        
           };

     

       2597
       2597
        
           nativeBuildInputs = [ pkgconfig ];

     

       2598
       2598
        
           buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];

+1 -1

pkgs/servers/x11/xorg/tarballs-7.7.list

···

       186
       186
        
       mirror://xorg/individual/app/xmag-1.0.6.tar.bz2

     

       187
       187
        
       mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2

     

       188
       188
        
       mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2

     

       189
       189
       -
       mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2

     

       189
       189
       +
       mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2

     

       190
       190
        
       mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2

     

       191
       191
        
       mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2

     

       192
       192
        
       mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

+2 -2

pkgs/shells/bash/4.4.nix

···

       68
       68
        
         ];

     

       69
       69
        
       

     

       70
       70
        
         # Note: Bison is needed because the patches above modify parse.y.

     

       71
       71
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       71
       72
        
         nativeBuildInputs = [bison]

     

       72
       73
        
           ++ optional (texinfo != null) texinfo

     

       73
       73
       -
           ++ optional hostPlatform.isDarwin binutils

     

       74
       74
       -
           ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;

     

       74
       74
       +
           ++ optional hostPlatform.isDarwin binutils;

     

       75
       75
        
       

     

       76
       76
        
         buildInputs = optional interactive readline70;

     

       77
       77

+1 -10

pkgs/stdenv/adapters.nix

···

       74
       74
        
           };

     

       75
       75
        
         in stdenv // {

     

       76
       76
        
           mkDerivation =

     

       77
       77
       -
             { buildInputs ? [], nativeBuildInputs ? []

     

       78
       78
       -
             , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []

     

       77
       77
       +
             { nativeBuildInputs ? []

     

       79
       78
        
             , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false

     

       80
       79
        
             , ...

     

       81
       80
        
             } @ args:

     
···

       97
       96
        
                   ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file

     

       98
       97
        
                   ++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook

     

       99
       98
        
                   ;

     

       100
       100
       -
       

     

       101
       101
       -
                 # Cross-linking dynamic libraries, every buildInput should

     

       102
       102
       -
                 # be propagated because ld needs the -rpath-link to find

     

       103
       103
       -
                 # any library needed to link the program dynamically at

     

       104
       104
       -
                 # loader time. ld(1) explains it.

     

       105
       105
       -
                 buildInputs = [];

     

       106
       106
       -
                 propagatedBuildInputs = propagatedBuildInputs ++ buildInputs;

     

       107
       107
       -
                 propagatedNativeBuildInputs = propagatedNativeBuildInputs;

     

       108
       99
        
       

     

       109
       100
        
                 crossConfig = hostPlatform.config;

     

       110
       101
        
               } // args.crossAttrs or {});

+15 -5

pkgs/stdenv/darwin/default.nix

···

       58
       58
        
                                 extraPreHook      ? "",

     

       59
       59
        
                                 extraNativeBuildInputs,

     

       60
       60
        
                                 extraBuildInputs,

     

       61
       61
       +
                                 libcxx,

     

       61
       62
        
                                 allowedRequisites ? null}:

     

       62
       63
        
           let

     

       63
       64
        
             buildPackages = lib.optionalAttrs (last ? stdenv) {

     
···

       81
       82
        
             cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {

     

       82
       83
        
               inherit shell;

     

       83
       84
        
               inherit (last) stdenvNoCC;

     

       85
       85
       +
       

     

       86
       86
       +
               extraPackages = lib.optional (libcxx != null) libcxx;

     

       84
       87
        
       

     

       85
       88
        
               nativeTools  = false;

     

       86
       89
        
               nativeLibc   = false;

     
···

       176
       179
        
       

     

       177
       180
        
           extraNativeBuildInputs = [];

     

       178
       181
        
           extraBuildInputs = [];

     

       182
       182
       +
           libcxx = null;

     

       179
       183
        
         };

     

       180
       184
        
       

     

       181
       185
        
         stage1 = prevStage: let

     
···

       183
       187
        
         in with prevStage; stageFun 1 prevStage {

     

       184
       188
        
           extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";

     

       185
       189
        
           extraNativeBuildInputs = [];

     

       186
       186
       -
           extraBuildInputs = [ pkgs.libcxx ];

     

       190
       190
       +
           extraBuildInputs = [ ];

     

       191
       191
       +
           libcxx = pkgs.libcxx;

     

       187
       192
        
       

     

       188
       193
        
           allowedRequisites =

     

       189
       194
        
             [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];

     
···

       210
       215
        
           '';

     

       211
       216
        
       

     

       212
       217
        
           extraNativeBuildInputs = [ pkgs.xz ];

     

       213
       213
       -
           extraBuildInputs = with pkgs; [ darwin.CF libcxx ];

     

       218
       218
       +
           extraBuildInputs = [ pkgs.darwin.CF ];

     

       219
       219
       +
           libcxx = pkgs.libcxx;

     

       214
       220
        
       

     

       215
       221
        
           allowedRequisites =

     

       216
       222
        
             [ bootstrapTools ] ++

     
···

       242
       248
        
           # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and

     

       243
       249
        
           # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.

     

       244
       250
        
           extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];

     

       245
       245
       -
           extraBuildInputs = with pkgs; [ darwin.CF libcxx ];

     

       251
       251
       +
           extraBuildInputs = [ pkgs.darwin.CF ];

     

       252
       252
       +
           libcxx = pkgs.libcxx;

     

       246
       253
        
       

     

       247
       254
        
           extraPreHook = ''

     

       248
       255
        
             export PATH=${pkgs.bash}/bin:$PATH

     
···

       277
       284
        
         in with prevStage; stageFun 4 prevStage {

     

       278
       285
        
           shell = "${pkgs.bash}/bin/bash";

     

       279
       286
        
           extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];

     

       280
       280
       -
           extraBuildInputs = with pkgs; [ darwin.CF libcxx ];

     

       287
       287
       +
           extraBuildInputs = [ pkgs.darwin.CF ];

     

       288
       288
       +
           libcxx = pkgs.libcxx;

     

       289
       289
       +
       

     

       281
       290
        
           extraPreHook = ''

     

       282
       291
        
             export PATH_LOCALE=${pkgs.darwin.locale}/share/locale

     

       283
       292
        
           '';

     
···

       347
       356
        
             cc       = pkgs.llvmPackages.clang-unwrapped;

     

       348
       357
        
             bintools = pkgs.darwin.binutils;

     

       349
       358
        
             libc     = pkgs.darwin.Libsystem;

     

       359
       359
       +
             extraPackages = [ pkgs.libcxx ];

     

       350
       360
        
           };

     

       351
       361
        
       

     

       352
       362
        
           extraNativeBuildInputs = [];

     

       353
       353
       -
           extraBuildInputs = with pkgs; [ darwin.CF libcxx ];

     

       363
       363
       +
           extraBuildInputs = [ pkgs.darwin.CF ];

     

       354
       364
        
       

     

       355
       365
        
           extraAttrs = {

     

       356
       366
        
             inherit platform bootstrapTools;

+60 -16

pkgs/stdenv/generic/make-derivation.nix

···

       14
       14
        
         mkDerivation =

     

       15
       15
        
           { name ? ""

     

       16
       16
        
       

     

       17
       17
       -
           , nativeBuildInputs ? []

     

       18
       18
       -
           , buildInputs ? []

     

       17
       17
       +
           # These types of dependencies are all exhaustively documented in

     

       18
       18
       +
           # the "Specifying Dependencies" section of the "Standard

     

       19
       19
       +
           # Environment" chapter of the Nixpkgs manual.

     

       19
       20
        
       

     

       20
       20
       -
           , propagatedNativeBuildInputs ? []

     

       21
       21
       -
           , propagatedBuildInputs ? []

     

       21
       21
       +
           # TODO(@Ericson2314): Stop using legacy dep attribute names

     

       22
       22
       +
       

     

       23
       23
       +
           #                           host offset -> target offset

     

       24
       24
       +
           , depsBuildBuild              ? [] # -1 -> -1

     

       25
       25
       +
           , depsBuildBuildPropagated    ? [] # -1 -> -1

     

       26
       26
       +
           , nativeBuildInputs           ? [] # -1 ->  0  N.B. Legacy name

     

       27
       27
       +
           , propagatedNativeBuildInputs ? [] # -1 ->  0  N.B. Legacy name

     

       28
       28
       +
           , depsBuildTarget             ? [] # -1 ->  1

     

       29
       29
       +
           , depsBuildTargetPropagated   ? [] # -1 ->  1

     

       30
       30
       +
       

     

       31
       31
       +
           , depsHostHost                ? [] #  0 ->  0

     

       32
       32
       +
           , depsHostHostPropagated      ? [] #  0 ->  0

     

       33
       33
       +
           , buildInputs                 ? [] #  0 ->  1  N.B. Legacy name

     

       34
       34
       +
           , propagatedBuildInputs       ? [] #  0 ->  1  N.B. Legacy name

     

       35
       35
       +
       

     

       36
       36
       +
           , depsTargetTarget            ? [] #  1 ->  1

     

       37
       37
       +
           , depsTargetTargetPropagated  ? [] #  1 ->  1

     

       22
       38
        
       

     

       23
       39
        
           , configureFlags ? []

     

       24
       40
        
           , # Target is not included by default because most programs don't care.

     
···

       56
       72
        
             inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags;

     

       57
       73
        
           })

     

       58
       74
        
           else let

     

       59
       59
       -
             dependencies = map lib.chooseDevOutputs [

     

       60
       60
       -
               (map (drv: drv.nativeDrv or drv) nativeBuildInputs

     

       61
       61
       -
                  ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh

     

       62
       62
       -
                  ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)

     

       63
       63
       -
               (map (drv: drv.crossDrv or drv) buildInputs)

     

       75
       75
       +
             dependencies = map (map lib.chooseDevOutputs) [

     

       76
       76
       +
               [

     

       77
       77
       +
                 (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild)

     

       78
       78
       +
                 (map (drv: drv.nativeDrv or drv) nativeBuildInputs

     

       79
       79
       +
                    ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh

     

       80
       80
       +
                    ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)

     

       81
       81
       +
                 (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget)

     

       82
       82
       +
               ]

     

       83
       83
       +
               [

     

       84
       84
       +
                 (map (drv: drv.__spliced.hostHost or drv) depsHostHost)

     

       85
       85
       +
                 (map (drv: drv.crossDrv or drv) buildInputs)

     

       86
       86
       +
               ]

     

       87
       87
       +
               [

     

       88
       88
       +
                 (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget)

     

       89
       89
       +
               ]

     

       64
       90
        
             ];

     

       65
       65
       -
             propagatedDependencies = map lib.chooseDevOutputs [

     

       66
       66
       -
               (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)

     

       67
       67
       -
               (map (drv: drv.crossDrv or drv) propagatedBuildInputs)

     

       91
       91
       +
             propagatedDependencies = map (map lib.chooseDevOutputs) [

     

       92
       92
       +
               [

     

       93
       93
       +
                 (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuildPropagated)

     

       94
       94
       +
                 (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)

     

       95
       95
       +
                 (map (drv: drv.__spliced.buildTarget or drv) depsBuildTargetPropagated)

     

       96
       96
       +
               ]

     

       97
       97
       +
               [

     

       98
       98
       +
                 (map (drv: drv.__spliced.hostHost or drv) depsHostHostPropagated)

     

       99
       99
       +
                 (map (drv: drv.crossDrv or drv) propagatedBuildInputs)

     

       100
       100
       +
               ]

     

       101
       101
       +
               [

     

       102
       102
       +
                 (map (drv: drv.__spliced.targetTarget or drv) depsTargetTargetPropagated)

     

       103
       103
       +
               ]

     

       68
       104
        
             ];

     

       69
       105
        
       

     

       70
       106
        
             outputs' =

     
···

       105
       141
        
                 userHook = config.stdenv.userHook or null;

     

       106
       142
        
                 __ignoreNulls = true;

     

       107
       143
        
       

     

       108
       108
       -
                 nativeBuildInputs = lib.elemAt dependencies 0;

     

       109
       109
       -
                 buildInputs = lib.elemAt dependencies 1;

     

       144
       144
       +
                 depsBuildBuild              = lib.elemAt (lib.elemAt dependencies 0) 0;

     

       145
       145
       +
                 nativeBuildInputs           = lib.elemAt (lib.elemAt dependencies 0) 1;

     

       146
       146
       +
                 depsBuildTarget             = lib.elemAt (lib.elemAt dependencies 0) 2;

     

       147
       147
       +
                 depsHostBuild               = lib.elemAt (lib.elemAt dependencies 1) 0;

     

       148
       148
       +
                 buildInputs                 = lib.elemAt (lib.elemAt dependencies 1) 1;

     

       149
       149
       +
                 depsTargetTarget            = lib.elemAt (lib.elemAt dependencies 2) 0;

     

       110
       150
        
       

     

       111
       111
       -
                 propagatedNativeBuildInputs = lib.elemAt propagatedDependencies 0;

     

       112
       112
       -
                 propagatedBuildInputs = lib.elemAt propagatedDependencies 1;

     

       151
       151
       +
                 depsBuildBuildPropagated    = lib.elemAt (lib.elemAt propagatedDependencies 0) 0;

     

       152
       152
       +
                 propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1;

     

       153
       153
       +
                 depsBuildTargetPropagated   = lib.elemAt (lib.elemAt propagatedDependencies 0) 2;

     

       154
       154
       +
                 depsHostBuildPropagated     = lib.elemAt (lib.elemAt propagatedDependencies 1) 0;

     

       155
       155
       +
                 propagatedBuildInputs       = lib.elemAt (lib.elemAt propagatedDependencies 1) 1;

     

       156
       156
       +
                 depsTargetTargetPropagated  = lib.elemAt (lib.elemAt propagatedDependencies 2) 0;

     

       113
       157
        
       

     

       114
       158
        
                 # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck

     

       115
       159
        
                 configureFlags = let inherit (lib) optional elem; in

+260 -74

pkgs/stdenv/generic/setup.sh

···

       300
       300
        
       runHook addInputsHook

     

       301
       301
        
       

     

       302
       302
        
       

     

       303
       303
       -
       # Recursively find all build inputs.

     

       303
       303
       +
       # Package accumulators

     

       304
       304
       +
       

     

       305
       305
       +
       # shellcheck disable=SC2034

     

       306
       306
       +
       declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget

     

       307
       307
       +
       declare -a pkgsHostHost pkgsHostTarget

     

       308
       308
       +
       declare -a pkgsTargetTarget

     

       309
       309
       +
       

     

       310
       310
       +
       declare -ra pkgBuildAccumVars=(pkgsBuildBuild pkgsBuildHost pkgsBuildTarget)

     

       311
       311
       +
       declare -ra pkgHostAccumVars=(pkgsHostHost pkgsHostTarget)

     

       312
       312
       +
       declare -ra pkgTargetAccumVars=(pkgsTargetTarget)

     

       313
       313
       +
       

     

       314
       314
       +
       declare -ra pkgAccumVarVars=(pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars)

     

       315
       315
       +
       

     

       316
       316
       +
       

     

       317
       317
       +
       # Hooks

     

       318
       318
       +
       

     

       319
       319
       +
       declare -a envBuildBuildHooks envBuildHostHooks envBuildTargetHooks

     

       320
       320
       +
       declare -a envHostHostHooks envHostTargetHooks

     

       321
       321
       +
       declare -a envTargetTargetHooks

     

       322
       322
       +
       

     

       323
       323
       +
       declare -ra pkgBuildHookVars=(envBuildBuildHook envBuildHostHook envBuildTargetHook)

     

       324
       324
       +
       declare -ra pkgHostHookVars=(envHostHostHook envHostTargetHook)

     

       325
       325
       +
       declare -ra pkgTargetHookVars=(envTargetTargetHook)

     

       326
       326
       +
       

     

       327
       327
       +
       declare -ra pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars)

     

       328
       328
       +
       

     

       329
       329
       +
       # Add env hooks for all sorts of deps with the specified host offset.

     

       330
       330
       +
       addEnvHooks() {

     

       331
       331
       +
           local depHostOffset="$1"

     

       332
       332
       +
           shift

     

       333
       333
       +
           local pkgHookVarsSlice="${pkgHookVarVars[$depHostOffset + 1]}[@]"

     

       334
       334
       +
           local pkgHookVar

     

       335
       335
       +
           for pkgHookVar in "${!pkgHookVarsSlice}"; do

     

       336
       336
       +
               eval "${pkgHookVar}s"'+=("$@")'

     

       337
       337
       +
           done

     

       338
       338
       +
       }

     

       339
       339
       +
       

     

       340
       340
       +
       

     

       341
       341
       +
       # Propagated dep files

     

       342
       342
       +
       

     

       343
       343
       +
       declare -ra propagatedBuildDepFiles=(

     

       344
       344
       +
           propagated-build-build-deps

     

       345
       345
       +
           propagated-native-build-inputs # Legacy name for back-compat

     

       346
       346
       +
           propagated-build-target-deps

     

       347
       347
       +
       )

     

       348
       348
       +
       declare -ra propagatedHostDepFiles=(

     

       349
       349
       +
           propagated-host-host-deps

     

       350
       350
       +
           propagated-build-inputs # Legacy name for back-compat

     

       351
       351
       +
       )

     

       352
       352
       +
       declare -ra propagatedTargetDepFiles=(

     

       353
       353
       +
           propagated-target-target-deps

     

       354
       354
       +
       )

     

       355
       355
       +
       declare -ra propagatedDepFilesVars=(

     

       356
       356
       +
           propagatedBuildDepFiles

     

       357
       357
       +
           propagatedHostDepFiles

     

       358
       358
       +
           propagatedTargetDepFiles

     

       359
       359
       +
       )

     

       360
       360
       +
       

     

       361
       361
       +
       # Platform offsets: build = -1, host = 0, target = 1

     

       362
       362
       +
       declare -ra allPlatOffsets=(-1 0 1)

     

       363
       363
       +
       

     

       364
       364
       +
       

     

       365
       365
       +
       # Mutually-recursively find all build inputs. See the dependency section of the

     

       366
       366
       +
       # stdenv chapter of the Nixpkgs manual for the specification this algorithm

     

       367
       367
       +
       # implements.

     

       304
       368
        
       findInputs() {

     

       305
       305
       -
           local pkg="$1"; shift

     

       306
       306
       -
           local var="$1"; shift

     

       307
       307
       -
           local propagatedBuildInputsFiles=("$@")

     

       369
       369
       +
           local -r pkg="$1"

     

       370
       370
       +
           local -ri hostOffset="$2"

     

       371
       371
       +
           local -ri targetOffset="$3"

     

       372
       372
       +
       

     

       373
       373
       +
           # Sanity check

     

       374
       374
       +
           (( "$hostOffset" <= "$targetOffset" )) || exit -1

     

       375
       375
       +
       

     

       376
       376
       +
           local varVar="${pkgAccumVarVars[$hostOffset + 1]}"

     

       377
       377
       +
           local varRef="$varVar[\$targetOffset - \$hostOffset]"

     

       378
       378
       +
           local var="${!varRef}"

     

       379
       379
       +
           unset -v varVar varRef

     

       308
       380
        
       

     

       309
       381
        
           # TODO(@Ericson2314): Restore using associative array once Darwin

     

       310
       382
        
           # nix-shell doesn't use impure bash. This should replace the O(n)

     
···

       324
       396
        
               exit 1

     

       325
       397
        
           fi

     

       326
       398
        
       

     

       327
       327
       -
           local file

     

       328
       328
       -
           for file in "${propagatedBuildInputsFiles[@]}"; do

     

       329
       329
       -
               file="$pkg/nix-support/$file"

     

       330
       330
       -
               [[ -f "$file" ]] || continue

     

       399
       399
       +
           # The current package's host and target offset together

     

       400
       400
       +
           # provide a <=-preserving homomorphism from the relative

     

       401
       401
       +
           # offsets to current offset

     

       402
       402
       +
           function mapOffset() {

     

       403
       403
       +
               local -ri inputOffset="$1"

     

       404
       404
       +
               if (( "$inputOffset" <= 0 )); then

     

       405
       405
       +
                   local -ri outputOffset="$inputOffset + $hostOffset"

     

       406
       406
       +
               else

     

       407
       407
       +
                   local -ri outputOffset="$inputOffset - 1 + $targetOffset"

     

       408
       408
       +
               fi

     

       409
       409
       +
               echo "$outputOffset"

     

       410
       410
       +
           }

     

       411
       411
       +
       

     

       412
       412
       +
           # Host offset relative to that of the package whose immediate

     

       413
       413
       +
           # dependencies we are currently exploring.

     

       414
       414
       +
           local -i relHostOffset

     

       415
       415
       +
           for relHostOffset in "${allPlatOffsets[@]}"; do

     

       416
       416
       +
               # `+ 1` so we start at 0 for valid index

     

       417
       417
       +
               local files="${propagatedDepFilesVars[$relHostOffset + 1]}"

     

       418
       418
       +
       

     

       419
       419
       +
               # Host offset relative to the package currently being

     

       420
       420
       +
               # built---as absolute an offset as will be used.

     

       421
       421
       +
               local -i hostOffsetNext

     

       422
       422
       +
               hostOffsetNext="$(mapOffset relHostOffset)"

     

       423
       423
       +
       

     

       424
       424
       +
               # Ensure we're in bounds relative to the package currently

     

       425
       425
       +
               # being built.

     

       426
       426
       +
               [[ "${allPlatOffsets[*]}" = *"$hostOffsetNext"*  ]] || continue

     

       427
       427
       +
       

     

       428
       428
       +
               # Target offset relative to the *host* offset of the package

     

       429
       429
       +
               # whose immediate dependencies we are currently exploring.

     

       430
       430
       +
               local -i relTargetOffset

     

       431
       431
       +
               for relTargetOffset in "${allPlatOffsets[@]}"; do

     

       432
       432
       +
                   (( "$relHostOffset" <= "$relTargetOffset" )) || continue

     

       433
       433
       +
       

     

       434
       434
       +
                   local fileRef="${files}[$relTargetOffset - $relHostOffset]"

     

       435
       435
       +
                   local file="${!fileRef}"

     

       436
       436
       +
                   unset -v fileRef

     

       437
       437
       +
       

     

       438
       438
       +
                   # Target offset relative to the package currently being

     

       439
       439
       +
                   # built.

     

       440
       440
       +
                   local -i targetOffsetNext

     

       441
       441
       +
                   targetOffsetNext="$(mapOffset relTargetOffset)"

     

       442
       442
       +
       

     

       443
       443
       +
                   # Once again, ensure we're in bounds relative to the

     

       444
       444
       +
                   # package currently being built.

     

       445
       445
       +
                   [[ "${allPlatOffsets[*]}" = *"$targetOffsetNext"* ]] || continue

     

       446
       446
       +
       

     

       447
       447
       +
                   [[ -f "$pkg/nix-support/$file" ]] || continue

     

       331
       448
        
       

     

       332
       332
       -
               local pkgNext

     

       333
       333
       -
               for pkgNext in $(< "$file"); do

     

       334
       334
       -
                   findInputs "$pkgNext" "$var" "${propagatedBuildInputsFiles[@]}"

     

       449
       449
       +
                   local pkgNext

     

       450
       450
       +
                   for pkgNext in $(< "$pkg/nix-support/$file"); do

     

       451
       451
       +
                       findInputs "$pkgNext" "$hostOffsetNext" "$targetOffsetNext"

     

       452
       452
       +
                   done

     

       335
       453
        
               done

     

       336
       454
        
           done

     

       337
       455
        
       }

     

       338
       456
        
       

     

       457
       457
       +
       # Make sure all are at least defined as empty

     

       458
       458
       +
       : ${depsBuildBuild=} ${depsBuildBuildPropagated=}

     

       459
       459
       +
       : ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=}

     

       460
       460
       +
       : ${depsBuildTarget=} ${depsBuildTargetPropagated=}

     

       461
       461
       +
       : ${depsHostHost=} ${depsHostHostPropagated=}

     

       462
       462
       +
       : ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=}

     

       463
       463
       +
       : ${depsTargetTarget=} ${depsTargetTargetPropagated=}

     

       464
       464
       +
       

     

       465
       465
       +
       for pkg in $depsBuildBuild $depsBuildBuildPropagated; do

     

       466
       466
       +
           findInputs "$pkg" -1 -1

     

       467
       467
       +
       done

     

       468
       468
       +
       for pkg in $nativeBuildInputs $propagatedNativeBuildInputs; do

     

       469
       469
       +
           findInputs "$pkg" -1  0

     

       470
       470
       +
       done

     

       471
       471
       +
       for pkg in $depsBuildTarget $depsBuildTargetPropagated; do

     

       472
       472
       +
           findInputs "$pkg" -1  1

     

       473
       473
       +
       done

     

       474
       474
       +
       for pkg in $depsHostHost $depsHostHostPropagated; do

     

       475
       475
       +
           findInputs "$pkg"  0  0

     

       476
       476
       +
       done

     

       477
       477
       +
       for pkg in $buildInputs $propagatedBuildInputs ; do

     

       478
       478
       +
           findInputs "$pkg"  0  1

     

       479
       479
       +
       done

     

       480
       480
       +
       for pkg in $depsTargetTarget $depsTargetTargetPropagated; do

     

       481
       481
       +
           findInputs "$pkg"  1  1

     

       482
       482
       +
       done

     

       483
       483
       +
       # Default inputs must be processed last

     

       484
       484
       +
       for pkg in $defaultNativeBuildInputs; do

     

       485
       485
       +
           findInputs "$pkg" -1  0

     

       486
       486
       +
       done

     

       487
       487
       +
       for pkg in $defaultBuildInputs; do

     

       488
       488
       +
           findInputs "$pkg"  0  1

     

       489
       489
       +
       done

     

       490
       490
       +
       

     

       339
       491
        
       # Add package to the future PATH and run setup hooks

     

       340
       492
        
       activatePackage() {

     

       341
       493
        
           local pkg="$1"

     

       494
       494
       +
           local -ri hostOffset="$2"

     

       495
       495
       +
           local -ri targetOffset="$3"

     

       496
       496
       +
       

     

       497
       497
       +
           # Sanity check

     

       498
       498
       +
           (( "$hostOffset" <= "$targetOffset" )) || exit -1

     

       342
       499
        
       

     

       343
       500
        
           if [ -f "$pkg" ]; then

     

       344
       501
        
               local oldOpts="$(shopt -po nounset)"

     
···

       347
       504
        
               eval "$oldOpts"

     

       348
       505
        
           fi

     

       349
       506
        
       

     

       350
       350
       -
           if [ -d "$pkg/bin" ]; then

     

       507
       507
       +
           # Only dependencies whose host platform is guaranteed to match the

     

       508
       508
       +
           # build platform are included here. That would be `depsBuild*`,

     

       509
       509
       +
           # and legacy `nativeBuildInputs`, in general. If we aren't cross

     

       510
       510
       +
           # compiling, however, everything can be put on the PATH. To ease

     

       511
       511
       +
           # the transition, we do include everything in thatcase.

     

       512
       512
       +
           #

     

       513
       513
       +
           # TODO(@Ericson2314): Don't special-case native compilation

     

       514
       514
       +
           if [[ ( -z "${crossConfig-}" ||  "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then

     

       351
       515
        
               addToSearchPath _PATH "$pkg/bin"

     

       352
       516
        
           fi

     

       353
       517
        
       

     

       354
       354
       -
           if [ -f "$pkg/nix-support/setup-hook" ]; then

     

       518
       518
       +
           if [[ -f "$pkg/nix-support/setup-hook" ]]; then

     

       355
       519
        
               local oldOpts="$(shopt -po nounset)"

     

       356
       520
        
               set +u

     

       357
       521
        
               source "$pkg/nix-support/setup-hook"

     
···

       359
       523
        
           fi

     

       360
       524
        
       }

     

       361
       525
        
       

     

       362
       362
       -
       declare -a nativePkgs crossPkgs

     

       363
       363
       -
       if [ -z "${crossConfig:-}" ]; then

     

       364
       364
       -
           # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)

     

       365
       365
       -
           # are handled identically to nativeBuildInputs

     

       366
       366
       -
           for i in ${nativeBuildInputs:-} ${buildInputs:-} \

     

       367
       367
       -
                    ${defaultNativeBuildInputs:-} ${defaultBuildInputs:-} \

     

       368
       368
       -
                    ${propagatedNativeBuildInputs:-} ${propagatedBuildInputs:-}; do

     

       369
       369
       -
               findInputs "$i" nativePkgs propagated-native-build-inputs propagated-build-inputs

     

       370
       370
       -
           done

     

       371
       371
       -
       else

     

       372
       372
       -
           for i in ${nativeBuildInputs:-} ${defaultNativeBuildInputs:-} ${propagatedNativeBuildInputs:-}; do

     

       373
       373
       -
               findInputs "$i" nativePkgs propagated-native-build-inputs

     

       526
       526
       +
       _activatePkgs() {

     

       527
       527
       +
           local -i hostOffset targetOffset

     

       528
       528
       +
           local pkg

     

       529
       529
       +
       

     

       530
       530
       +
           for hostOffset in "${allPlatOffsets[@]}"; do

     

       531
       531
       +
               local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}"

     

       532
       532
       +
               for targetOffset in "${allPlatOffsets[@]}"; do

     

       533
       533
       +
                   (( "$hostOffset" <= "$targetOffset" )) || continue

     

       534
       534
       +
                   local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]"

     

       535
       535
       +
                   local pkgsSlice="${!pkgsRef}[@]"

     

       536
       536
       +
                   for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do

     

       537
       537
       +
                       activatePackage "$pkg" "$hostOffset" "$targetOffset"

     

       538
       538
       +
                   done

     

       539
       539
       +
               done

     

       374
       540
        
           done

     

       375
       375
       -
           for i in ${buildInputs:-} ${defaultBuildInputs:-} ${propagatedBuildInputs:-}; do

     

       376
       376
       -
               findInputs "$i" crossPkgs propagated-build-inputs

     

       377
       377
       -
           done

     

       378
       378
       -
       fi

     

       541
       541
       +
       }

     

       379
       542
        
       

     

       380
       380
       -
       for i in ${nativePkgs+"${nativePkgs[@]}"} ${crossPkgs+"${crossPkgs[@]}"}; do

     

       381
       381
       -
           activatePackage "$i"

     

       382
       382
       -
       done

     

       383
       383
       -
       

     

       543
       543
       +
       # Run the package setup hooks and build _PATH

     

       544
       544
       +
       _activatePkgs

     

       384
       545
        
       

     

       385
       546
        
       # Set the relevant environment variables to point to the build inputs

     

       386
       547
        
       # found above.

     

       387
       548
        
       #

     

       388
       388
       -
       # These `depOffset`s tell the env hook what sort of dependency

     

       389
       389
       -
       # (ignoring propagatedness) is being passed to the env hook. In a real

     

       390
       390
       -
       # language, we'd append a closure with this information to the

     

       391
       391
       -
       # relevant env hook array, but bash doesn't have closures, so it's

     

       392
       392
       -
       # easier to just pass this in.

     

       549
       549
       +
       # These `depOffset`s, beyond indexing the arrays, also tell the env

     

       550
       550
       +
       # hook what sort of dependency (ignoring propagatedness) is being

     

       551
       551
       +
       # passed to the env hook. In a real language, we'd append a closure

     

       552
       552
       +
       # with this information to the relevant env hook array, but bash

     

       553
       553
       +
       # doesn't have closures, so it's easier to just pass this in.

     

       554
       554
       +
       _addToEnv() {

     

       555
       555
       +
           local -i depHostOffset depTargetOffset

     

       556
       556
       +
           local pkg

     

       393
       557
        
       

     

       394
       394
       -
       _addToNativeEnv() {

     

       395
       395
       -
           local pkg="$1"

     

       396
       396
       -
           if [[ -n "${crossConfig:-}" ]]; then

     

       397
       397
       -
               local -i depOffset=-1

     

       398
       398
       -
           else

     

       399
       399
       -
               local -i depOffset=0

     

       400
       400
       -
           fi

     

       401
       401
       -
       

     

       402
       402
       -
           # Run the package-specific hooks set by the setup-hook scripts.

     

       403
       403
       -
           runHook envHook "$pkg"

     

       404
       404
       -
       }

     

       405
       405
       -
       

     

       406
       406
       -
       # Old bash empty array hack

     

       407
       407
       -
       for i in ${nativePkgs+"${nativePkgs[@]}"}; do

     

       408
       408
       -
           _addToNativeEnv "$i"

     

       409
       409
       -
       done

     

       410
       410
       -
       

     

       411
       411
       -
       _addToCrossEnv() {

     

       412
       412
       -
           local pkg="$1"

     

       413
       413
       -
           local -i depOffset=0

     

       414
       414
       -
       

     

       415
       415
       -
           # Run the package-specific hooks set by the setup-hook scripts.

     

       416
       416
       -
           runHook crossEnvHook "$pkg"

     

       558
       558
       +
           for depHostOffset in "${allPlatOffsets[@]}"; do

     

       559
       559
       +
               local hookVar="${pkgHookVarVars[$depHostOffset + 1]}"

     

       560
       560
       +
               local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}"

     

       561
       561
       +
               for depTargetOffset in "${allPlatOffsets[@]}"; do

     

       562
       562
       +
                   (( "$depHostOffset" <= "$depTargetOffset" )) || continue

     

       563
       563
       +
                   local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"

     

       564
       564
       +
                   if [[ -z "${crossConfig-}" ]]; then

     

       565
       565
       +
                       # Apply environment hooks to all packages during native

     

       566
       566
       +
                       # compilation to ease the transition.

     

       567
       567
       +
                       #

     

       568
       568
       +
                       # TODO(@Ericson2314): Don't special-case native compilation

     

       569
       569
       +
                       for pkg in \

     

       570
       570
       +
                           ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \

     

       571
       571
       +
                           ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \

     

       572
       572
       +
                           ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \

     

       573
       573
       +
                           ${pkgsHostHost+"${pkgsHostHost[@]}"} \

     

       574
       574
       +
                           ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \

     

       575
       575
       +
                           ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"}

     

       576
       576
       +
                       do

     

       577
       577
       +
                           runHook "${!hookRef}" "$pkg"

     

       578
       578
       +
                       done

     

       579
       579
       +
                   else

     

       580
       580
       +
                       local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]"

     

       581
       581
       +
                       local pkgsSlice="${!pkgsRef}[@]"

     

       582
       582
       +
                       for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do

     

       583
       583
       +
                           runHook "${!hookRef}" "$pkg"

     

       584
       584
       +
                       done

     

       585
       585
       +
                   fi

     

       586
       586
       +
               done

     

       587
       587
       +
           done

     

       417
       588
        
       }

     

       418
       589
        
       

     

       419
       419
       -
       # Old bash empty array hack

     

       420
       420
       -
       for i in ${crossPkgs+"${crossPkgs[@]}"}; do

     

       421
       421
       -
           _addToCrossEnv "$i"

     

       422
       422
       -
       done

     

       590
       590
       +
       # Run the package-specific hooks set by the setup-hook scripts.

     

       591
       591
       +
       _addToEnv

     

       423
       592
        
       

     

       424
       593
        
       

     

       425
       594
        
       _addRpathPrefix "$out"

     
···

       882
       1051
        
       # propagated-build-inputs.

     

       883
       1052
        
       fixupPhase() {

     

       884
       1053
        
           # Make sure everything is writable so "strip" et al. work.

     

       1054
       1054
       +
           local output

     

       885
       1055
        
           for output in $outputs; do

     

       886
       1056
        
               if [ -e "${!output}" ]; then chmod -R u+w "${!output}"; fi

     

       887
       1057
        
           done

     
···

       895
       1065
        
           done

     

       896
       1066
        
       

     

       897
       1067
        
       

     

       898
       898
       -
           # Propagate build inputs and setup hook into the development output.

     

       1068
       1068
       +
           # Propagate dependencies & setup hook into the development output.

     

       1069
       1069
       +
           declare -ra flatVars=(

     

       1070
       1070
       +
               # Build

     

       1071
       1071
       +
               depsBuildBuildPropagated

     

       1072
       1072
       +
               propagatedNativeBuildInputs

     

       1073
       1073
       +
               depsBuildTargetPropagated

     

       1074
       1074
       +
               # Host

     

       1075
       1075
       +
               depsHostHostPropagated

     

       1076
       1076
       +
               propagatedBuildInputs

     

       1077
       1077
       +
               # Target

     

       1078
       1078
       +
               depsTargetTargetPropagated

     

       1079
       1079
       +
           )

     

       1080
       1080
       +
           declare -ra flatFiles=(

     

       1081
       1081
       +
               "${propagatedBuildDepFiles[@]}"

     

       1082
       1082
       +
               "${propagatedHostDepFiles[@]}"

     

       1083
       1083
       +
               "${propagatedTargetDepFiles[@]}"

     

       1084
       1084
       +
           )

     

       1085
       1085
       +
       

     

       1086
       1086
       +
           local propagatedInputsIndex

     

       1087
       1087
       +
           for propagatedInputsIndex in "${!flatVars[@]}"; do

     

       1088
       1088
       +
               local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]"

     

       1089
       1089
       +
               local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}"

     

       899
       1090
        
       

     

       900
       900
       -
           if [ -n "${propagatedBuildInputs:-}" ]; then

     

       901
       901
       -
               mkdir -p "${!outputDev}/nix-support"

     

       902
       902
       -
               # shellcheck disable=SC2086

     

       903
       903
       -
               printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"

     

       904
       904
       -
           fi

     

       1091
       1091
       +
               [[ "${!propagatedInputsSlice}" ]] || continue

     

       905
       1092
        
       

     

       906
       906
       -
           if [ -n "${propagatedNativeBuildInputs:-}" ]; then

     

       907
       1093
        
               mkdir -p "${!outputDev}/nix-support"

     

       908
       1094
        
               # shellcheck disable=SC2086

     

       909
       909
       -
               printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"

     

       910
       910
       -
           fi

     

       1095
       1095
       +
               printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile"

     

       1096
       1096
       +
           done

     

       911
       1097
        
       

     

       912
       1098
        
       

     

       913
       1099
        
           if [ -n "${setupHook:-}" ]; then

+1

pkgs/stdenv/linux/make-bootstrap-tools-cross.nix

···

       193
       193
        
               nuke-refs $out/bin/*

     

       194
       194
        
               nuke-refs $out/lib/*

     

       195
       195
        
               nuke-refs $out/libexec/gcc/*/*/*

     

       196
       196
       +
               nuke-refs $out/lib/gcc/*/*/*

     

       196
       197
        
       

     

       197
       198
        
               mkdir $out/.pack

     

       198
       199
        
               mv $out/* $out/.pack

+6 -3

pkgs/tools/admin/ansible/2.1.nix

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , fetchurl

     

       3
       3
       +
       , fetchFromGitHub

     

       3
       4
        
       , pythonPackages

     

       4
       5
        
       , windowsSupport ? false

     

       5
       6
        
       }:

     
···

       10
       11
        
         jinja = jinja2.overridePythonAttrs (old: rec {

     

       11
       12
        
           version = "2.8.1";

     

       12
       13
        
           name = "${old.pname}-${version}";

     

       13
       13
       -
           src = old.src.override {

     

       14
       14
       -
             inherit version;

     

       15
       15
       -
             sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891";

     

       14
       14
       +
           src = fetchFromGitHub {

     

       15
       15
       +
             owner = "pallets";

     

       16
       16
       +
             repo = "jinja";

     

       17
       17
       +
             rev = version;

     

       18
       18
       +
             sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a";

     

       16
       19
        
           };

     

       17
       20
        
         });

     

       18
       21
        
       in buildPythonPackage rec {

+6 -3

pkgs/tools/admin/ansible/2.2.nix

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , fetchurl

     

       3
       3
       +
       , fetchFromGitHub

     

       3
       4
        
       , pythonPackages

     

       4
       5
        
       , windowsSupport ? false

     

       5
       6
        
       }:

     
···

       12
       13
        
         jinja = jinja2.overridePythonAttrs (old: rec {

     

       13
       14
        
           version = "2.8.1";

     

       14
       15
        
           name = "${old.pname}-${version}";

     

       15
       15
       -
           src = old.src.override {

     

       16
       16
       -
             inherit version;

     

       17
       17
       -
             sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891";

     

       16
       16
       +
           src = fetchFromGitHub {

     

       17
       17
       +
             owner = "pallets";

     

       18
       18
       +
             repo = "jinja";

     

       19
       19
       +
             rev = version;

     

       20
       20
       +
             sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a";

     

       18
       21
        
           };

     

       19
       22
        
         });

     

       20
       23
        
       in buildPythonPackage rec {

+2 -3

pkgs/tools/admin/awscli/default.nix

···

       25
       25
        
         });

     

       26
       26
        
       

     

       27
       27
        
       in buildPythonPackage rec {

     

       28
       28
       -
         name = "${pname}-${version}";

     

       29
       28
        
         pname = "awscli";

     

       30
       30
       -
         version = "1.14.6";

     

       29
       29
       +
         version = "1.14.17";

     

       31
       30
        
         namePrefix = "";

     

       32
       31
        
       

     

       33
       32
        
         src = fetchPypi {

     

       34
       33
        
           inherit pname version;

     

       35
       35
       -
           sha256 = "1lhv8vb3bkjfjg4jm3hgfjssxgqy50gb6vbkh4lxiy8cn3y2dxp1";

     

       34
       34
       +
           sha256 = "456499acc41ab67671062a08e218a22aa1a1ff64ae531e694163d0371e8a1dd0";

     

       36
       35
        
         };

     

       37
       36
        
       

     

       38
       37
        
         # No tests included

+4 -4

pkgs/tools/backup/bareos/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex

     

       2
       2
        
       , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb

     

       3
       3
       -
       , sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null

     

       3
       3
       +
       , sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null

     

       4
       4
        
       , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       assert sqlite != null || postgresql != null || libmysql != null;

     

       7
       7
       +
       assert sqlite != null || postgresql != null || mysql != null;

     

       8
       8
        
       

     

       9
       9
        
       with stdenv.lib;

     

       10
       10
        
       let

     
···

       25
       25
        
         nativeBuildInputs = [ pkgconfig ];

     

       26
       26
        
         buildInputs = [

     

       27
       27
        
           nettools gettext readline openssl python2 flex ncurses sqlite postgresql

     

       28
       28
       -
           libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb

     

       28
       28
       +
           mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         postPatch = ''

     
···

       55
       55
        
           ++ optional (openssl != null) "--with-openssl=${openssl.dev}"

     

       56
       56
        
           ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"

     

       57
       57
        
           ++ optional (postgresql != null) "--with-postgresql=${postgresql}"

     

       58
       58
       -
           ++ optional (libmysql != null) "--with-mysql=${libmysql.dev}"

     

       58
       58
       +
           ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}"

     

       59
       59
        
           ++ optional (zlib != null) "--with-zlib=${zlib.dev}"

     

       60
       60
        
           ++ optional (lzo != null) "--with-lzo=${lzo}"

     

       61
       61
        
           ++ optional (jansson != null) "--with-jansson=${jansson}"

+2 -2

pkgs/tools/backup/mydumper/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, cmake, pkgconfig

     

       2
       2
       -
       , glib, zlib, pcre, mariadb, libressl, }:

     

       2
       2
       +
       , glib, zlib, pcre, mysql, libressl }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         version = "0.9.3";

     
···

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ cmake pkgconfig ];

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ glib zlib pcre mariadb.client.dev libressl ];

     

       17
       17
       +
         buildInputs = [ glib zlib pcre mysql.connector-c libressl ];

     

       18
       18
        
       

     

       19
       19
        
         meta = with stdenv.lib; {

     

       20
       20
        
           description = ''High-perfomance MySQL backup tool'';

+94 -85

pkgs/tools/inputmethods/ibus/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, wrapGAppsHook

     

       2
       2
       -
       , intltool, isocodes, pkgconfig

     

       3
       3
       -
       , python3

     

       4
       4
       -
       , gtk2, gtk3, atk, dconf, glib, json_glib

     

       5
       5
       -
       , dbus, libnotify, gobjectIntrospection, wayland

     

       6
       6
       -
       }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig

     

       2
       2
       +
       , vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2

     

       3
       3
       +
       , gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true

     

       4
       4
       +
       , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }:

     

       5
       5
       +
       

     

       6
       6
       +
       assert withWayland -> wayland != null && libxkbcommon != null;

     

       7
       7
       +
       

     

       8
       8
       +
       with stdenv.lib;

     

       7
       9
        
       

     

       8
       10
        
       let

     

       9
       9
       -
         emojiData = let

     

       10
       10
       -
           srcs = {

     

       11
       11
       -
             data = fetchurl {

     

       12
       12
       -
               url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt";

     

       13
       13
       -
               sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf";

     

       14
       14
       -
             };

     

       15
       15
       -
             sequences = fetchurl {

     

       16
       16
       -
               url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt";

     

       17
       17
       -
               sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1";

     

       18
       18
       -
             };

     

       19
       19
       -
             variation-sequences = fetchurl {

     

       20
       20
       -
               url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt";

     

       21
       21
       -
               sha256 = "1wlg4gbq7spmpppjfy5zdl82sj0hc836p8gljgfrjmwsjgybq286";

     

       22
       22
       -
             };

     

       23
       23
       -
             zwj-sequences = fetchurl {

     

       24
       24
       -
               url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt";

     

       25
       25
       -
               sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q";

     

       26
       26
       -
             };

     

       27
       27
       -
             test = fetchurl {

     

       28
       28
       -
               url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt";

     

       29
       29
       -
               sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw";

     

       30
       30
       -
             };

     

       11
       11
       +
         emojiSrcs = {

     

       12
       12
       +
           data = fetchurl {

     

       13
       13
       +
             url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt";

     

       14
       14
       +
             sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf";

     

       15
       15
       +
           };

     

       16
       16
       +
           sequences = fetchurl {

     

       17
       17
       +
             url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt";

     

       18
       18
       +
             sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1";

     

       31
       19
        
           };

     

       32
       32
       -
         in stdenv.mkDerivation {

     

       20
       20
       +
           variation-sequences = fetchurl {

     

       21
       21
       +
             url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt";

     

       22
       22
       +
             sha256 = "1wlg4gbq7spmpppjfy5zdl82sj0hc836p8gljgfrjmwsjgybq286";

     

       23
       23
       +
           };

     

       24
       24
       +
           zwj-sequences = fetchurl {

     

       25
       25
       +
             url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt";

     

       26
       26
       +
             sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q";

     

       27
       27
       +
           };

     

       28
       28
       +
           test = fetchurl {

     

       29
       29
       +
             url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt";

     

       30
       30
       +
             sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw";

     

       31
       31
       +
           };

     

       32
       32
       +
         };

     

       33
       33
       +
         emojiData = stdenv.mkDerivation {

     

       33
       34
        
           name = "emoji-data-5.0";

     

       34
       35
        
           unpackPhase = ":";

     

       35
       35
       -
           dontBuild = true;

     

       36
       36
       -
           installPhase = with stdenv.lib; ''

     

       36
       36
       +
           installPhase = ''

     

       37
       37
        
             mkdir $out

     

       38
       38
       -
             ${builtins.toString (flip mapAttrsToList srcs (k: v: ''

     

       39
       39
       -
               cp ${v} $out/emoji-${k}.txt

     

       40
       40
       -
             ''))}

     

       38
       38
       +
             ${builtins.toString (flip mapAttrsToList emojiSrcs (k: v: "cp ${v} $out/emoji-${k}.txt;"))}

     

       41
       39
        
           '';

     

       42
       40
        
         };

     

       43
       41
        
         cldrEmojiAnnotation = stdenv.mkDerivation rec {

     

       44
       42
        
           name = "cldr-emoji-annotation-${version}";

     

       45
       45
       -
           version = "31.0.1_1";

     

       46
       46
       -
           src = fetchurl {

     

       47
       47
       -
             url = "https://github.com/fujiwarat/cldr-emoji-annotation/releases/download/${version}/${name}.tar.gz";

     

       48
       48
       -
             sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7";

     

       43
       43
       +
           version = "31.90.0_1";

     

       44
       44
       +
           src = fetchFromGitHub {

     

       45
       45
       +
             owner = "fujiwarat";

     

       46
       46
       +
             repo = "cldr-emoji-annotation";

     

       47
       47
       +
             rev = version;

     

       48
       48
       +
             sha256 = "1vsj32bg8ab4d80rz0fxy6sj2lv31inzyjnddjm079bnvlaf2kih";

     

       49
       49
        
           };

     

       50
       50
       +
           nativeBuildInputs = [ autoreconfHook ];

     

       50
       51
        
         };

     

       51
       51
       -
         pyEnv = python3.buildEnv.override {

     

       52
       52
       -
           extraLibs = [ python3.pkgs.pygobject3 ];

     

       53
       53
       -
       

     

       52
       52
       +
         python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]);

     

       53
       53
       +
         python3BuildEnv = python3.buildEnv.override {

     

       54
       54
        
           # ImportError: No module named site

     

       55
       55
        
           postBuild = ''

     

       56
       56
       -
             makeWrapper '${glib.dev}/bin/glib-genmarshal' "$out"/bin/glib-genmarshal \

     

       57
       57
       -
               --unset PYTHONPATH

     

       56
       56
       +
             makeWrapper ${glib.dev}/bin/gdbus-codegen $out/bin/gdbus-codegen --unset PYTHONPATH

     

       57
       57
       +
             makeWrapper ${glib.dev}/bin/glib-genmarshal $out/bin/glib-genmarshal --unset PYTHONPATH

     

       58
       58
       +
             makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH

     

       58
       59
        
           '';

     

       59
       60
        
         };

     

       60
       60
       -
       in stdenv.mkDerivation rec {

     

       61
       61
       +
       in

     

       62
       62
       +
       

     

       63
       63
       +
       stdenv.mkDerivation rec {

     

       61
       64
        
         name = "ibus-${version}";

     

       62
       62
       -
         version = "1.5.16";

     

       65
       65
       +
         version = "1.5.17";

     

       63
       66
        
       

     

       64
       64
       -
         src = fetchurl {

     

       65
       65
       -
           url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz";

     

       66
       66
       -
           sha256 = "07py16jb81kd7vkqhcia9cb2avsbg5jswp2kzf0k4bprwkxppd9n";

     

       67
       67
       +
         src = fetchFromGitHub {

     

       68
       68
       +
           owner = "ibus";

     

       69
       69
       +
           repo = "ibus";

     

       70
       70
       +
           rev = version;

     

       71
       71
       +
           sha256 = "09mrj9d8qpl9cbylg1zx8c3ymc5gdy4jrf6zs125wjz0b574g5av";

     

       67
       72
        
         };

     

       68
       73
        
       

     

       69
       74
        
         postPatch = ''

     

       70
       70
       -
           # These paths will be set in the wrapper.

     

       71
       71
       -
           sed -e "/export IBUS_DATAROOTDIR/ s/^.*$//" \

     

       72
       72
       -
               -e "/export IBUS_LIBEXECDIR/ s/^.*$//" \

     

       73
       73
       -
               -e "/export IBUS_LOCALEDIR/ s/^.*$//" \

     

       74
       74
       -
               -e "/export IBUS_PREFIX/ s/^.*$//" \

     

       75
       75
       -
               -i "setup/ibus-setup.in"

     

       75
       75
       +
           substituteInPlace setup/ibus-setup.in --subst-var-by PYTHON ${python3Runtime.interpreter}

     

       76
       76
       +
           substituteInPlace data/dconf/Makefile.am --replace "dconf update" true

     

       77
       77
       +
           substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus

     

       78
       78
       +
           echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh

     

       79
       79
       +
           cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make .

     

       76
       80
        
         '';

     

       77
       81
        
       

     

       82
       82
       +
         preAutoreconf = "touch ChangeLog";

     

       83
       83
       +
         preConfigure = "intltoolize";

     

       84
       84
       +
       

     

       78
       85
        
         configureFlags = [

     

       79
       86
        
           "--disable-gconf"

     

       80
       80
       -
           "--enable-dconf"

     

       81
       87
        
           "--disable-memconf"

     

       82
       82
       -
           "--enable-ui"

     

       83
       83
       -
           "--enable-python-library"

     

       88
       88
       +
           (enableFeature (dconf != null) "dconf")

     

       89
       89
       +
           (enableFeature (libnotify != null) "libnotify")

     

       90
       90
       +
           (enableFeature withWayland "wayland")

     

       91
       91
       +
           (enableFeature enablePythonLibrary "python-library")

     

       92
       92
       +
           (enableFeature enableUI "ui")

     

       84
       93
        
           "--with-unicode-emoji-dir=${emojiData}"

     

       85
       94
        
           "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations"

     

       86
       95
        
         ];

     

       87
       96
        
       

     

       88
       88
       -
         buildInputs = [

     

       89
       89
       -
           pyEnv

     

       90
       90
       -
           intltool isocodes pkgconfig

     

       91
       91
       -
           gtk2 gtk3 dconf

     

       92
       92
       -
           json_glib

     

       93
       93
       -
           dbus libnotify gobjectIntrospection wayland

     

       97
       97
       +
         nativeBuildInputs = [

     

       98
       98
       +
           autoreconfHook

     

       99
       99
       +
           gconf

     

       100
       100
       +
           gtk_doc

     

       101
       101
       +
           intltool

     

       102
       102
       +
           makeWrapper

     

       103
       103
       +
           pkgconfig

     

       104
       104
       +
           python3BuildEnv

     

       105
       105
       +
           vala

     

       106
       106
       +
           wrapGAppsHook

     

       94
       107
        
         ];

     

       95
       108
        
       

     

       96
       109
        
         propagatedBuildInputs = [ glib ];

     

       97
       110
        
       

     

       98
       98
       -
         nativeBuildInputs = [ wrapGAppsHook ];

     

       99
       99
       -
       

     

       100
       100
       -
         outputs = [ "out" "dev" ];

     

       111
       111
       +
         buildInputs = [

     

       112
       112
       +
           dbus

     

       113
       113
       +
           dconf

     

       114
       114
       +
           gdk_pixbuf

     

       115
       115
       +
           gobjectIntrospection

     

       116
       116
       +
           gtk2

     

       117
       117
       +
           gtk3

     

       118
       118
       +
           isocodes

     

       119
       119
       +
           json_glib

     

       120
       120
       +
           libnotify

     

       121
       121
       +
         ] ++ optionals withWayland [

     

       122
       122
       +
           libxkbcommon

     

       123
       123
       +
           wayland

     

       124
       124
       +
         ];

     

       101
       125
        
       

     

       102
       126
        
         enableParallelBuilding = true;

     

       103
       127
        
       

     

       104
       104
       -
         preConfigure = ''

     

       105
       105
       -
           # Fix hard-coded installation paths, so make does not try to overwrite our

     

       106
       106
       -
           # Python installation.

     

       107
       107
       -
           sed -e "/py2overridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \

     

       108
       108
       -
               -e "/pyoverridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \

     

       109
       109
       -
               -e "/PYTHON2_LIBDIR/ s|=.*|=$out/lib/${python3.libPrefix}|" \

     

       110
       110
       -
               -i configure

     

       111
       111
       -
       

     

       112
       112
       -
           # Don't try to generate a system-wide dconf database; it wouldn't work.

     

       113
       113
       -
           substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"

     

       114
       114
       -
         '';

     

       115
       115
       -
       

     

       116
       128
        
         doInstallCheck = true;

     

       117
       129
        
         installCheckPhase = "$out/bin/ibus version";

     

       118
       130
        
       

     

       119
       119
       -
         postInstall = ''

     

       120
       120
       -
           moveToOutput "bin/ibus-setup" "$dev"

     

       121
       121
       -
         '';

     

       122
       122
       -
       

     

       123
       123
       -
         meta = with stdenv.lib; {

     

       131
       131
       +
         meta = {

     

       124
       132
        
           homepage = https://github.com/ibus/ibus;

     

       125
       125
       -
           description = "Intelligent Input Bus for Linux / Unix OS";

     

       133
       133
       +
           description = "Intelligent Input Bus, input method framework";

     

       134
       134
       +
           license = licenses.lgpl21Plus;

     

       126
       135
        
           platforms = platforms.linux;

     

       127
       127
       -
           maintainers = [ maintainers.ttuegel ];

     

       136
       136
       +
           maintainers = with maintainers; [ ttuegel yegortimoshenko ];

     

       128
       137
        
         };

     

       129
       138
        
       }

+2 -2

pkgs/tools/misc/colord-kde/default.nix

···

       14
       14
        
           sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ extra-cmake-modules ki18n ];

     

       17
       17
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

     

       20
       20
        
           kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes

     

       21
       21
       -
           kcmutils kio knotifications plasma-framework kwidgetsaddons

     

       21
       21
       +
           kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons

     

       22
       22
        
           kwindowsystem kitemviews lcms2 libXrandr qtx11extras

     

       23
       23
        
         ];

     

       24
       24

+2 -2

pkgs/tools/misc/coreutils/default.nix

···

       14
       14
        
       with lib;

     

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
       -
         name = "coreutils-8.28";

     

       17
       17
       +
         name = "coreutils-8.29";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchurl {

     

       20
       20
        
           url = "mirror://gnu/coreutils/${name}.tar.xz";

     

       21
       21
       -
           sha256 = "0r8c1bgm68kl70j1lgd0rv12iykw6143k4m9a56xip9rc2hv25qi";

     

       21
       21
       +
           sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;

+2 -2

pkgs/tools/networking/kea/default.nix

···

       21
       21
        
         configureFlags = [

     

       22
       22
        
           "--localstatedir=/var"

     

       23
       23
        
           "--with-dhcp-pgsql=${postgresql}/bin/pg_config"

     

       24
       24
       -
           "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config"

     

       24
       24
       +
           "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config"

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       28
       28
        
         buildInputs = [

     

       29
       29
       -
           openssl log4cplus boost python3 mysql.client

     

       29
       29
       +
           openssl log4cplus boost python3 mysql.connector-c

     

       30
       30
        
           botan2 gmp bzip2

     

       31
       31
        
         ];

     

       32
       32

+13 -8

pkgs/tools/networking/mailutils/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, libtool, pkgconfig

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig

     

       2
       2
        
       , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools

     

       3
       3
       -
       , gss, mysql }:

     

       3
       3
       +
       , python, gss, mysql }:

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files";

     

       7
       7
       -
       in

     

       8
       8
       -
       stdenv.mkDerivation rec {

     

       7
       7
       +
       in stdenv.mkDerivation rec {

     

       9
       8
        
         name = "${project}-${version}";

     

       10
       9
        
         project = "mailutils";

     

       11
       10
        
         version = "3.2";

     
···

       16
       15
        
         };

     

       17
       16
        
       

     

       18
       17
        
         nativeBuildInputs = [

     

       19
       19
       -
           autoreconfHook gettext libtool pkgconfig

     

       18
       18
       +
           autoreconfHook gettext pkgconfig

     

       20
       19
        
         ] ++ stdenv.lib.optional doCheck dejagnu;

     

       21
       20
        
         buildInputs = [

     

       22
       21
        
           gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools

     

       23
       23
       -
           gss mysql.lib

     

       22
       22
       +
           gss mysql.connector-c python

     

       24
       23
        
         ];

     

       25
       24
        
       

     

       26
       25
        
         patches = [

     
···

       52
       51
        
         ];

     

       53
       52
        
       

     

       54
       53
        
         postPatch = ''

     

       55
       55
       -
           sed -e '/AM_GNU_GETTEXT_VERSION/s/0.18/0.19/' -i configure.ac

     

       56
       54
        
           sed -i -e '/chown root:mail/d' \

     

       57
       55
        
                  -e 's/chmod [24]755/chmod 0755/' \

     

       58
       56
        
             */Makefile{.in,.am}

     

       57
       57
       +
           sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac

     

       58
       58
       +
           sed -i 's/0\.18/0.19/' configure.ac

     

       59
       59
       +
           sed -i -e 's:mysql/mysql.h:mysql.h:' \

     

       60
       60
       +
                  -e 's:mysql/errmsg.h:errmsg.h:' \

     

       61
       61
       +
             sql/mysql.c

     

       59
       62
        
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql";

     

       60
       65
        
       

     

       61
       66
        
         preCheck = ''

     

       62
       62
       -
           # Add missing files.

     

       67
       67
       +
           # Add missing test files

     

       63
       68
        
           cp ${builtins.toString readmsg-tests} readmsg/tests/

     

       64
       69
        
           for f in hdr.at nohdr.at twomsg.at weed.at; do

     

       65
       70
        
             mv readmsg/tests/*-$f readmsg/tests/$f

+25 -3

pkgs/tools/networking/mitmproxy/default.nix

···

       1
       1
        
       { stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }:

     

       2
       2
        
       

     

       3
       3
       -
       python3.pkgs.buildPythonPackage rec {

     

       3
       3
       +
       let

     

       4
       4
       +
         # When overrides are not needed, then only remove the contents of this set.

     

       5
       5
       +
         packageOverrides = self: super: {

     

       6
       6
       +
           ldap3 = super.ldap3.overridePythonAttrs (oldAttrs: rec {

     

       7
       7
       +
             version = "2.3";

     

       8
       8
       +
             src = oldAttrs.src.override {

     

       9
       9
       +
               inherit version;

     

       10
       10
       +
               sha256 = "c056b3756076e15aa71c963c7c5a44d5d9bbd430263ee49598d4454223a766ac";

     

       11
       11
       +
             };

     

       12
       12
       +
           });

     

       13
       13
       +
           pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec {

     

       14
       14
       +
             version = "0.3.7";

     

       15
       15
       +
             src = oldAttrs.src.override {

     

       16
       16
       +
               inherit version;

     

       17
       17
       +
               sha256 = "187f2a66d617683f8e82d5c00033b7c8a0287e1da88a9d577aebec321cad4965";

     

       18
       18
       +
             };

     

       19
       19
       +
           });

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         pythonPackages = (python3.override {inherit packageOverrides; }).pkgs;

     

       23
       23
       +
       in with pythonPackages;

     

       24
       24
       +
       

     

       25
       25
       +
       buildPythonPackage rec {

     

       4
       26
        
         baseName = "mitmproxy";

     

       5
       27
        
         name = "${baseName}-unstable-2017-10-31";

     

       6
       28
        
       

     
···

       17
       39
        
           LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs '

     

       18
       40
        
         '';

     

       19
       41
        
       

     

       20
       20
       -
         propagatedBuildInputs = with python3.pkgs; [

     

       42
       42
       +
         propagatedBuildInputs = [

     

       21
       43
        
           blinker click certifi cryptography

     

       22
       44
        
           h2 hyperframe

     

       23
       45
        
           kaitaistruct passlib pyasn1 pyopenssl

     
···

       25
       47
        
           urwid brotlipy sortedcontainers ldap3

     

       26
       48
        
         ];

     

       27
       49
        
       

     

       28
       28
       -
         buildInputs = with python3.pkgs; [

     

       50
       50
       +
         buildInputs = [

     

       29
       51
        
           beautifulsoup4 flask pytest pytestrunner glibcLocales

     

       30
       52
        
         ];

     

       31
       53

+2 -2

pkgs/tools/networking/snabb/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }:

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "snabb-${version}";

     
···

       22
       22
        
           done

     

       23
       23
        
       

     

       24
       24
        
           # We need a way to pass $PATH to the scripts

     

       25
       25
       -
           sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc

     

       25
       25
       +
           sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc

     

       26
       26
        
           sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc

     

       27
       27
        
         '';

     

       28
       28

+2 -2

pkgs/tools/security/gnupg/22.nix

···

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
        
         name = "gnupg-${version}";

     

       17
       17
        
       

     

       18
       18
       -
         version = "2.2.3";

     

       18
       18
       +
         version = "2.2.4";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchurl {

     

       21
       21
        
           url = "mirror://gnupg/gnupg/${name}.tar.bz2";

     

       22
       22
       -
           sha256 = "1d4482c4pbi0p1k8cc0f9c4q51k56v8navrbz5samxrrs42p3lyb";

     

       22
       22
       +
           sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/tools/security/thc-hydra/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysql, postgresql

     

       1
       1
       +
       { stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql

     

       2
       2
        
       , withGUI ? false, makeWrapper, pkgconfig, gtk2 }:

     

       3
       3
        
       

     

       4
       4
        
       let

     
···

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];

     

       26
       26
       -
         buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysql postgresql ]

     

       26
       26
       +
         buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ]

     

       27
       27
        
                       ++ lib.optional withGUI gtk2;

     

       28
       28
        
       

     

       29
       29
        
         postInstall = lib.optionalString withGUI ''

+3 -2

pkgs/tools/system/collectd/default.nix

···

       20
       20
        
       , libtool ? null

     

       21
       21
        
       , lm_sensors ? null

     

       22
       22
        
       , lvm2 ? null

     

       23
       23
       -
       , libmysql ? null

     

       23
       23
       +
       , mysql ? null

     

       24
       24
        
       , postgresql ? null

     

       25
       25
        
       , protobufc ? null

     

       26
       26
        
       , python ? null

     
···

       53
       53
        
         buildInputs = [

     

       54
       54
        
           curl libdbi libgcrypt libmemcached

     

       55
       55
        
           cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt

     

       56
       56
       -
           libxml2 libmysql postgresql protobufc rrdtool

     

       56
       56
       +
           libxml2 postgresql protobufc rrdtool

     

       57
       57
        
           varnish yajl jdk libtool python hiredis libmicrohttpd

     

       58
       58
        
           riemann_c_client mosquitto rdkafka mongoc

     

       59
       59
       +
         ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c

     

       59
       60
        
         ] ++ stdenv.lib.optionals stdenv.isLinux [

     

       60
       61
        
           iptables libatasmart libcredis libmodbus libsigrok

     

       61
       62
        
           lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl

+5 -4

pkgs/tools/system/rsyslog/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson

     

       2
       2
       -
       , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null

     

       2
       2
       +
       , libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null

     

       3
       3
        
       , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null

     

       4
       4
        
       , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null

     

       5
       5
        
       , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null

     
···

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ pkgconfig autoreconfHook ];

     

       24
       24
        
         buildInputs = [

     

       25
       25
       -
           fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql

     

       25
       25
       +
           fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc 

     

       26
       26
        
           postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl

     

       27
       27
        
           librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq

     

       28
       28
        
           rabbitmq-c hiredis

     

       29
       29
       -
         ] ++ stdenv.lib.optional stdenv.isLinux systemd;

     

       29
       29
       +
         ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c

     

       30
       30
       +
           ++ stdenv.lib.optional stdenv.isLinux systemd;

     

       30
       31
        
       

     

       31
       32
        
         hardeningDisable = [ "format" ];

     

       32
       33
        
       

     
···

       49
       50
        
           (mkFlag false                     "valgrind")

     

       50
       51
        
           (mkFlag false                     "diagtools")

     

       51
       52
        
           (mkFlag true                      "usertools")

     

       52
       52
       -
           (mkFlag (libmysql != null)        "mysql")

     

       53
       53
       +
           (mkFlag (mysql != null)           "mysql")

     

       53
       54
        
           (mkFlag (postgresql != null)      "pgsql")

     

       54
       55
        
           (mkFlag (libdbi != null)          "libdbi")

     

       55
       56
        
           (mkFlag (net_snmp != null)        "snmp")

+2 -1

pkgs/tools/text/diffutils/default.nix

···

       17
       17
        
         configureFlags =

     

       18
       18
        
           # "pr" need not be on the PATH as a run-time dep, so we need to tell

     

       19
       19
        
           # configure where it is. Covers the cross and native case alike.

     

       20
       20
       -
           stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr";

     

       20
       20
       +
           stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"

     

       21
       21
       +
           ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes";

     

       21
       22
        
       

     

       22
       23
        
         meta = {

     

       23
       24
        
           homepage = http://www.gnu.org/software/diffutils/diffutils.html;

+2

pkgs/tools/text/gawk/default.nix

···

       41
       41
        
           (if interactive then "--with-readline=${readline.dev}" else "--without-readline")

     

       42
       42
        
         ];

     

       43
       43
        
       

     

       44
       44
       +
         makeFlags = "AR=${stdenv.cc.targetPrefix}ar";

     

       45
       45
       +
       

     

       44
       46
        
         inherit doCheck;

     

       45
       47
        
       

     

       46
       48
        
         postInstall = ''

+1 -1

pkgs/tools/text/sgml/opensp/setup-hook.sh

···

       18
       18
        
           export ftp_proxy=http://nodtd.invalid/

     

       19
       19
        
       

     

       20
       20
        
           export SGML_CATALOG_FILES

     

       21
       21
       -
           envHooks+=(addSGMLCatalogs)

     

       21
       21
       +
           addEnvHooks "$targetOffset" addSGMLCatalogs

     

       22
       22
        
       fi

+2 -2

pkgs/tools/typesetting/tex/dblatex/default.nix

···

       21
       21
        
         ghostscript != null;

     

       22
       22
        
       

     

       23
       23
        
       stdenv.mkDerivation rec {

     

       24
       24
       -
         name = "dblatex-0.3.7";

     

       24
       24
       +
         name = "dblatex-0.3.10";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchurl {

     

       27
       27
        
           url = "mirror://sourceforge/dblatex/${name}.tar.bz2";

     

       28
       28
       -
           sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr";

     

       28
       28
       +
           sha256 = "1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [ python2 libxslt tex ]

+1 -1

pkgs/tools/typesetting/tex/tetex/setup-hook.sh

···

       4
       4
        
           fi

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
       -
       envHooks+=(addTeXMFPath)

     

       7
       7
       +
       addEnvHooks "$targetOffset" addTeXMFPath

+1 -1

pkgs/tools/typesetting/tex/texlive/setup-hook.sh

···

       4
       4
        
           fi

     

       5
       5
        
       }

     

       6
       6
        
       

     

       7
       7
       -
       envHooks+=(addTeXMFPath)

     

       7
       7
       +
       addEnvHooks "$targetOffset" addTeXMFPath

+1

pkgs/top-level/aliases.nix

···

       95
       95
        
         libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29

     

       96
       96
        
         libcap_progs = libcap.out; # added 2016-04-29

     

       97
       97
        
         libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28

     

       98
       98
       +
         libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient

     

       98
       99
        
         libtidy = html-tidy;  # added 2014-12-21

     

       99
       100
        
         links = links2; # added 2016-01-31

     

       100
       101
        
         lttngTools = lttng-tools;  # added 2014-07-31

+9 -11

pkgs/top-level/all-packages.nix

···

       1256
       1256
        
           libkrb5 = null;

     

       1257
       1257
        
           systemd = null;

     

       1258
       1258
        
           jemalloc = null;

     

       1259
       1259
       -
           libmysql = null;

     

       1259
       1259
       +
           mysql = null;

     

       1260
       1260
        
           postgresql = null;

     

       1261
       1261
        
           libdbi = null;

     

       1262
       1262
        
           net_snmp = null;

     
···

       1514
       1514
        
         convertlit = callPackage ../tools/text/convertlit { };

     

       1515
       1515
        
       

     

       1516
       1516
        
         collectd = callPackage ../tools/system/collectd {

     

       1517
       1517
       -
           libmysql = mysql.lib;

     

       1518
       1517
        
           libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet

     

       1519
       1518
        
         };

     

       1520
       1519
        
       

     
···

       1553
       1552
        
         skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { };

     

       1554
       1553
        
       

     

       1555
       1554
        
         ibus = callPackage ../tools/inputmethods/ibus {

     

       1556
       1556
       -
           inherit (gnome3) dconf glib;

     

       1555
       1555
       +
           inherit (gnome3) dconf gconf glib;

     

       1557
       1556
        
         };

     

       1558
       1557
        
       

     

       1559
       1558
        
         ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };

     
···

       6500
       6499
        
           vala_0_28

     

       6501
       6500
        
           vala_0_32

     

       6502
       6501
        
           vala_0_34

     

       6502
       6502
       +
           vala_0_36

     

       6503
       6503
        
           vala_0_38

     

       6504
       6504
        
           vala;

     

       6505
       6505
        
       

     
···

       8065
       8065
        
         boost163 = callPackage ../development/libraries/boost/1.63.nix { };

     

       8066
       8066
        
         boost164 = callPackage ../development/libraries/boost/1.64.nix { };

     

       8067
       8067
        
         boost165 = callPackage ../development/libraries/boost/1.65.nix { };

     

       8068
       8068
       -
         boost16x = boost165;

     

       8068
       8068
       +
         boost166 = callPackage ../development/libraries/boost/1.66.nix { };

     

       8069
       8069
       +
         boost16x = boost166;

     

       8069
       8070
        
         boost = boost16x;

     

       8070
       8071
        
       

     

       8071
       8072
        
         boost_process = callPackage ../development/libraries/boost-process { };

     
···

       9216
       9217
        
         libdbi = callPackage ../development/libraries/libdbi { };

     

       9217
       9218
        
       

     

       9218
       9219
        
         libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {

     

       9219
       9219
       -
           libmysql = null;

     

       9220
       9220
       +
           mysql = null;

     

       9220
       9221
        
           sqlite = null;

     

       9221
       9222
        
         };

     

       9222
       9223
        
       

     

       9223
       9224
        
         libdbiDrivers = libdbiDriversBase.override {

     

       9224
       9224
       -
           inherit sqlite libmysql;

     

       9225
       9225
       +
           inherit sqlite mysql;

     

       9225
       9226
        
         };

     

       9226
       9227
        
       

     

       9227
       9228
        
         libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { };

     
···

       11298
       11299
        
         x265 = callPackage ../development/libraries/x265 { };

     

       11299
       11300
        
       

     

       11300
       11301
        
         inherit (callPackages ../development/libraries/xapian { })

     

       11301
       11301
       -
           xapian_1_2_22 xapian_1_4_4;

     

       11302
       11302
       -
         xapian = xapian_1_4_4;

     

       11302
       11302
       +
           xapian_1_2_22 xapian_1_4;

     

       11303
       11303
       +
         xapian = xapian_1_4;

     

       11303
       11304
        
       

     

       11304
       11305
        
         xapian-omega = callPackage ../development/libraries/xapian/tools/omega {

     

       11305
       11306
        
           libmagic = file;

     
···

       12038
       12039
        
         };

     

       12039
       12040
        
       

     

       12040
       12041
        
         mysql = mariadb;

     

       12041
       12041
       -
         libmysql = mysql.client; # `libmysql` is a slight misnomer ATM

     

       12042
       12042
        
       

     

       12043
       12043
        
         mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };

     

       12044
       12044
        
       

     
···

       18134
       18134
        
         gcs = callPackage ../games/gcs { };

     

       18135
       18135
        
       

     

       18136
       18136
        
         gemrb = callPackage ../games/gemrb { };

     

       18137
       18137
       -
       

     

       18138
       18138
       -
         ghostOne = callPackage ../servers/games/ghost-one { };

     

       18139
       18137
        
       

     

       18140
       18138
        
         gl117 = callPackage ../games/gl-117 {};

     

       18141
       18139

+4 -3

pkgs/top-level/lua-packages.nix

···

       8
       8
        
       { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool

     

       9
       9
        
       , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo

     

       10
       10
        
       , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook

     

       11
       11
       -
       , libmysql, postgresql, cyrus_sasl

     

       11
       11
       +
       , mysql, postgresql, cyrus_sasl

     

       12
       12
        
       , fetchFromGitHub, libmpack, which

     

       13
       13
        
       }:

     

       14
       14
        
       

     
···

       210
       210
        
           };

     

       211
       211
        
           sourceRoot = ".";

     

       212
       212
        
       

     

       213
       213
       -
           buildInputs = [ libmysql postgresql sqlite ];

     

       213
       213
       +
           buildInputs = [ mysql.connector-c postgresql sqlite ];

     

       214
       214
        
       

     

       215
       215
        
           preConfigure = ''

     

       216
       216
        
             substituteInPlace Makefile --replace CC=gcc CC=cc

     
···

       220
       220
        
           '';

     

       221
       221
        
       

     

       222
       222
        
           NIX_CFLAGS_COMPILE = [

     

       223
       223
       -
             "-I${libmysql.dev}/include/mysql"

     

       223
       223
       +
             "-I${mysql.connector-c}/include/mysql"

     

       224
       224
       +
             "-L${mysql.connector-c}/lib/mysql"

     

       224
       225
        
             "-I${postgresql}/include/server"

     

       225
       226
        
           ];

     

       226
       227

+51 -594

pkgs/top-level/python-packages.nix

···

       173
       173
        
       

     

       174
       174
        
         automat = callPackage ../development/python-modules/automat { };

     

       175
       175
        
       

     

       176
       176
       +
         aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { };

     

       177
       177
       +
       

     

       176
       178
        
         # packages defined elsewhere

     

       177
       179
        
       

     

       178
       180
        
         backports_csv = callPackage ../development/python-modules/backports_csv {};

     
···

       479
       481
        
           meta = {

     

       480
       482
        
             homepage = https://pypi.python.org/pypi/anyjson/;

     

       481
       483
        
             description = "Wrapper that selects the best available JSON implementation";

     

       482
       482
       -
           };

     

       483
       483
       -
         };

     

       484
       484
       -
       

     

       485
       485
       -
         amqp_1 = buildPythonPackage rec {

     

       486
       486
       -
           name = "amqp-${version}";

     

       487
       487
       -
           version = "1.4.9";

     

       488
       488
       -
           disabled = pythonOlder "2.6";

     

       489
       489
       -
       

     

       490
       490
       -
           src = pkgs.fetchurl {

     

       491
       491
       -
             url = "mirror://pypi/a/amqp/${name}.tar.gz";

     

       492
       492
       -
             sha256 = "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid";

     

       493
       493
       -
           };

     

       494
       494
       -
       

     

       495
       495
       -
           buildInputs = with self; [ mock coverage nose-cover3 unittest2 ];

     

       496
       496
       -
       

     

       497
       497
       -
           meta = {

     

       498
       498
       -
             homepage = https://github.com/celery/py-amqp;

     

       499
       499
       -
             description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";

     

       500
       500
       -
             license = licenses.lgpl21;

     

       501
       484
        
           };

     

       502
       485
        
         };

     

       503
       486
        
       

     
···

       1020
       1003
        
           };

     

       1021
       1004
        
         };

     

       1022
       1005
        
       

     

       1023
       1023
       -
         backports_abc = buildPythonPackage rec {

     

       1024
       1024
       -
           name = "backports_abc-${version}";

     

       1025
       1025
       -
           version = "0.4";

     

       1026
       1026
       -
       

     

       1027
       1027
       -
           src = pkgs.fetchurl {

     

       1028
       1028
       -
             url = "mirror://pypi/b/backports_abc/${name}.tar.gz";

     

       1029
       1029
       -
             sha256 = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5";

     

       1030
       1030
       -
           };

     

       1031
       1031
       -
       

     

       1032
       1032
       -
           checkPhase = ''

     

       1033
       1033
       -
             ${python.interpreter} -m unittest discover

     

       1034
       1034
       -
           '';

     

       1006
       1006
       +
         backports_abc = callPackage ../development/python-modules/backports_abc { };

     

       1035
       1007
        
       

     

       1036
       1036
       -
           meta = {

     

       1037
       1037
       -
             homepage = https://github.com/cython/backports_abc;

     

       1038
       1038
       -
             license = licenses.psfl;

     

       1039
       1039
       -
             description = "A backport of recent additions to the 'collections.abc' module";

     

       1040
       1040
       -
           };

     

       1041
       1041
       -
         };

     

       1042
       1042
       -
       

     

       1043
       1043
       -
         backports_functools_lru_cache = buildPythonPackage rec {

     

       1044
       1044
       -
           name = "backports.functools_lru_cache-${version}";

     

       1045
       1045
       -
           version = "1.3";

     

       1046
       1046
       -
       

     

       1047
       1047
       -
           src = pkgs.fetchurl {

     

       1048
       1048
       -
             url = "mirror://pypi/b/backports_functools_lru_cache/${name}.tar.gz";

     

       1049
       1049
       -
             sha256 = "444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95";

     

       1050
       1050
       -
           };

     

       1051
       1051
       -
       

     

       1052
       1052
       -
           buildInputs = with self; [ setuptools_scm ];

     

       1053
       1053
       -
           doCheck = false; # No proper test

     

       1054
       1054
       -
       

     

       1055
       1055
       -
           meta = {

     

       1056
       1056
       -
             description = "Backport of functools.lru_cache";

     

       1057
       1057
       -
             homepage = https://github.com/jaraco/backports.functools_lru_cache;

     

       1058
       1058
       -
             license = licenses.mit;

     

       1059
       1059
       -
           };

     

       1060
       1060
       -
         };

     

       1008
       1008
       +
         backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { };

     

       1061
       1009
        
       

     

       1062
       1010
        
         backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { };

     

       1063
       1011
        
       

     
···

       1090
       1038
        
           };

     

       1091
       1039
        
         };

     

       1092
       1040
        
       

     

       1093
       1093
       -
         backports_lzma = self.buildPythonPackage rec {

     

       1094
       1094
       -
           name = "backports.lzma-0.0.3";

     

       1095
       1095
       -
           disabled = isPy3k;

     

       1096
       1096
       -
       

     

       1097
       1097
       -
           src = pkgs.fetchurl {

     

       1098
       1098
       -
             url = "mirror://pypi/b/backports.lzma/${name}.tar.gz";

     

       1099
       1099
       -
             sha256 = "bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca";

     

       1100
       1100
       -
           };

     

       1101
       1101
       -
       

     

       1102
       1102
       -
           buildInputs = [ pkgs.lzma ];

     

       1103
       1103
       -
       

     

       1104
       1104
       -
           meta = {

     

       1105
       1105
       -
             description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files";

     

       1106
       1106
       -
             homepage = https://github.com/peterjc/backports.lzma;

     

       1107
       1107
       -
             license = licenses.bsd3;

     

       1108
       1108
       -
           };

     

       1109
       1109
       -
         };

     

       1041
       1041
       +
         backports_lzma = callPackage ../development/python-modules/backports_lzma { };

     

       1110
       1042
        
       

     

       1111
       1043
        
         backports_tempfile = callPackage ../development/python-modules/backports_tempfile { };

     

       1112
       1044
        
       

     
···

       1307
       1239
        
           };

     

       1308
       1240
        
         };

     

       1309
       1241
        
       

     

       1310
       1310
       -
         biopython = buildPythonPackage rec {

     

       1311
       1311
       -
           name = "biopython-${version}";

     

       1312
       1312
       -
           version = "1.68";

     

       1313
       1313
       -
       

     

       1314
       1314
       -
           src = pkgs.fetchurl {

     

       1315
       1315
       -
             url = "mirror://pypi/b/biopython/${name}.tar.gz";

     

       1316
       1316
       -
             sha256 = "07qc7nz0k77y8hf8s18rscvibvm91zw0kkq7ylrhisf8vp8hkp6i";

     

       1317
       1317
       -
           };

     

       1318
       1318
       -
       

     

       1319
       1319
       -
           propagatedBuildInputs = with self; [ numpy ];

     

       1320
       1320
       -
           # Checks try to write to $HOME, which does not work with nix

     

       1321
       1321
       -
           doCheck = false;

     

       1322
       1322
       -
           meta = {

     

       1323
       1323
       -
             description = "Python library for bioinformatics";

     

       1324
       1324
       -
       

     

       1325
       1325
       -
             longDescription = ''

     

       1326
       1326
       -
               Biopython is a set of freely available tools for biological computation

     

       1327
       1327
       -
               written in Python by an international team of developers. It is a

     

       1328
       1328
       -
               distributed collaborative effort to develop Python libraries and

     

       1329
       1329
       -
               applications which address the needs of current and future work in

     

       1330
       1330
       -
               bioinformatics.

     

       1331
       1331
       -
             '';

     

       1332
       1332
       -
       

     

       1333
       1333
       -
             homepage = http://biopython.org/wiki/Documentation;

     

       1334
       1334
       -
             maintainers = with maintainers; [ luispedro ];

     

       1335
       1335
       -
           };

     

       1336
       1336
       -
         };

     

       1242
       1242
       +
         biopython = callPackage ../development/python-modules/biopython { };

     

       1337
       1243
        
       

     

       1338
       1244
        
         bedup = buildPythonPackage rec {

     

       1339
       1245
        
           version = "0.10.1";

     
···

       1406
       1312
        
           propagatedBuildInputs = with self; [ boto crcmod psutil ];

     

       1407
       1313
        
         };

     

       1408
       1314
        
       

     

       1409
       1409
       -
         cached-property = buildPythonPackage rec {

     

       1410
       1410
       -
           version = "1.3.0";

     

       1411
       1411
       -
           name = "cached-property-${version}";

     

       1412
       1412
       -
       

     

       1413
       1413
       -
           src = pkgs.fetchurl {

     

       1414
       1414
       -
             url = "mirror://pypi/c/cached-property/${name}.tar.gz";

     

       1415
       1415
       -
             sha256 = "10dwi3s6f154ag9dvqy5jiwp31fs57lbxjcjgn4cwvi8qyqpi3j5";

     

       1416
       1416
       -
           };

     

       1417
       1417
       -
       

     

       1418
       1418
       -
           buildInputs = with self; [ freezegun ];

     

       1419
       1419
       -
       

     

       1420
       1420
       -
           meta = {

     

       1421
       1421
       -
             description = "A decorator for caching properties in classes";

     

       1422
       1422
       -
             homepage = https://github.com/pydanny/cached-property;

     

       1423
       1423
       -
             license = licenses.bsd3;

     

       1424
       1424
       -
             platforms = platforms.unix;

     

       1425
       1425
       -
             maintainers = with maintainers; [ ericsagnes ];

     

       1426
       1426
       -
           };

     

       1427
       1427
       -
         };

     

       1315
       1315
       +
         cached-property = callPackage ../development/python-modules/cached-property { };

     

       1428
       1316
        
       

     

       1429
       1317
        
         caffe = pkgs.caffe.override {

     

       1430
       1318
        
           python = self.python;

     
···

       1994
       1882
        
           };

     

       1995
       1883
        
         };

     

       1996
       1884
        
       

     

       1997
       1997
       -
         boto3 = buildPythonPackage rec {

     

       1998
       1998
       -
           name = "boto3-${version}";

     

       1999
       1999
       -
           version = "1.4.8";

     

       2000
       2000
       -
       

     

       2001
       2001
       -
           src = pkgs.fetchFromGitHub {

     

       2002
       2002
       -
             owner = "boto";

     

       2003
       2003
       -
             repo  = "boto3";

     

       2004
       2004
       -
             rev   = version;

     

       2005
       2005
       -
             sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi";

     

       2006
       2006
       -
           };

     

       2007
       2007
       -
       

     

       2008
       2008
       -
           propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++

     

       2009
       2009
       -
                                   (if isPy3k then [] else [self.futures]);

     

       2010
       2010
       -
           buildInputs = [ self.docutils self.nose self.mock ];

     

       2011
       2011
       -
           checkPhase = ''

     

       2012
       2012
       -
             runHook preCheck

     

       2013
       2013
       -
             # This method is not in mock. It might have appeared in some versions.

     

       2014
       2014
       -
             sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \

     

       2015
       2015
       -
               tests/unit/resources/test_factory.py

     

       2016
       2016
       -
             nosetests -d tests/unit --verbose

     

       2017
       2017
       -
             runHook postCheck

     

       2018
       2018
       -
           '';

     

       2019
       2019
       -
       

     

       2020
       2020
       -
           # Network access

     

       2021
       2021
       -
           doCheck = false;

     

       2022
       2022
       -
       

     

       2023
       2023
       -
           meta = {

     

       2024
       2024
       -
             homepage = https://github.com/boto/boto3;

     

       2025
       2025
       -
             license = stdenv.lib.licenses.asl20;

     

       2026
       2026
       -
             description = "AWS SDK for Python";

     

       2027
       2027
       -
             longDescription = ''

     

       2028
       2028
       -
               Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for

     

       2029
       2029
       -
               Python, which allows Python developers to write software that makes use of

     

       2030
       2030
       -
               services like Amazon S3 and Amazon EC2.

     

       2031
       2031
       -
             '';

     

       2032
       2032
       -
           };

     

       2033
       2033
       -
         };

     

       1885
       1885
       +
         boto3 = callPackage ../development/python-modules/boto3 { };

     

       2034
       1886
        
       

     

       2035
       1887
        
         botocore = callPackage ../development/python-modules/botocore { };

     

       2036
       1888
        
       

     
···

       3125
       2977
        
         openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {};

     

       3126
       2978
        
       

     

       3127
       2979
        
       

     

       3128
       3128
       -
         idna = buildPythonPackage rec {

     

       3129
       3129
       -
           pname = "idna";

     

       3130
       3130
       -
           version = "2.5";

     

       3131
       3131
       -
           name = "${pname}-${version}";

     

       3132
       3132
       -
       

     

       3133
       3133
       -
           src = fetchPypi {

     

       3134
       3134
       -
             inherit pname version;

     

       3135
       3135
       -
             sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab";

     

       3136
       3136
       -
           };

     

       3137
       3137
       -
       

     

       3138
       3138
       -
           meta = {

     

       3139
       3139
       -
             homepage = "http://github.com/kjd/idna/";

     

       3140
       3140
       -
             description = "Internationalized Domain Names in Applications (IDNA)";

     

       3141
       3141
       -
             license = "licenses.bsd3";

     

       3142
       3142
       -
           };

     

       3143
       3143
       -
         };

     

       2980
       2980
       +
         idna = callPackage ../development/python-modules/idna { };

     

       3144
       2981
        
       

     

       3145
       2982
        
         mahotas = buildPythonPackage rec {

     

       3146
       2983
        
           name = "python-mahotas-${version}";

     
···

       3437
       3274
        
           };

     

       3438
       3275
        
         };

     

       3439
       3276
        
       

     

       3440
       3440
       -
         pytest = self.pytest_32;

     

       3277
       3277
       +
         pytest = self.pytest_33;

     

       3441
       3278
        
       

     

       3442
       3279
        
         pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};

     

       3443
       3280
        
       

     
···

       3452
       3289
        
             pytest = null;

     

       3453
       3290
        
           };

     

       3454
       3291
        
         };

     

       3455
       3455
       -
         pytest_32 = callPackage ../development/python-modules/pytest{

     

       3292
       3292
       +
       

     

       3293
       3293
       +
         pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{

     

       3294
       3294
       +
           hypothesis = self.hypothesis.override {

     

       3295
       3295
       +
             # hypothesis requires pytest that causes dependency cycle

     

       3296
       3296
       +
             doCheck = false;

     

       3297
       3297
       +
             pytest = null;

     

       3298
       3298
       +
           };

     

       3299
       3299
       +
         };

     

       3300
       3300
       +
       

     

       3301
       3301
       +
         pytest_33 = callPackage ../development/python-modules/pytest/default.nix{

     

       3456
       3302
        
           hypothesis = self.hypothesis.override {

     

       3457
       3303
        
             # hypothesis requires pytest that causes dependency cycle

     

       3458
       3304
        
             doCheck = false;

     
···

       4256
       4102
        
           };

     

       4257
       4103
        
         };

     

       4258
       4104
        
       

     

       4259
       4259
       -
         decorator = buildPythonPackage rec {

     

       4260
       4260
       -
           name = "decorator-${version}";

     

       4261
       4261
       -
           version = "4.0.11";

     

       4262
       4262
       -
       

     

       4263
       4263
       -
           src = pkgs.fetchurl {

     

       4264
       4264
       -
             url = "mirror://pypi/d/decorator/${name}.tar.gz";

     

       4265
       4265
       -
             sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76";

     

       4266
       4266
       -
           };

     

       4267
       4267
       -
       

     

       4268
       4268
       -
           meta = {

     

       4269
       4269
       -
             homepage = https://pypi.python.org/pypi/decorator;

     

       4270
       4270
       -
             description = "Better living through Python with decorators";

     

       4271
       4271
       -
             license = licenses.mit;

     

       4272
       4272
       -
           };

     

       4273
       4273
       -
         };

     

       4105
       4105
       +
         decorator = callPackage ../development/python-modules/decorator { };

     

       4274
       4106
        
       

     

       4275
       4107
        
         deform = buildPythonPackage rec {

     

       4276
       4108
        
           name = "deform-2.0a2";

     
···

       5710
       5542
        
           };

     

       5711
       5543
        
         };

     

       5712
       5544
        
       

     

       5713
       5713
       -
         jdcal = buildPythonPackage rec {

     

       5714
       5714
       -
           version = "1.0";

     

       5715
       5715
       -
           name = "jdcal-${version}";

     

       5716
       5716
       -
       

     

       5717
       5717
       -
           src = pkgs.fetchFromGitHub {

     

       5718
       5718
       -
             owner = "phn";

     

       5719
       5719
       -
             repo = "jdcal";

     

       5720
       5720
       -
             rev = "v${version}";

     

       5721
       5721
       -
             sha256 = "0jjgrrylraqzk3n97hay4gj00ky6vlvkfaapfgqlbcxyq30j24vq";

     

       5722
       5722
       -
           };

     

       5723
       5723
       -
       

     

       5724
       5724
       -
           meta = {

     

       5725
       5725
       -
             description = "A module containing functions for converting between Julian dates and calendar dates";

     

       5726
       5726
       -
             homepage = "https://github.com/phn/jdcal";

     

       5727
       5727
       -
             license = licenses.bsd2;

     

       5728
       5728
       -
             maintainers = with maintainers; [ lihop ];

     

       5729
       5729
       -
             platforms = platforms.all;

     

       5730
       5730
       -
           };

     

       5731
       5731
       -
         };

     

       5545
       5545
       +
         jdcal = callPackage ../development/python-modules/jdcal { };

     

       5732
       5546
        
       

     

       5733
       5547
        
         internetarchive = callPackage ../development/python-modules/internetarchive {};

     

       5734
       5548
        
       

     
···

       5739
       5553
        
         jsmin = callPackage ../development/python-modules/jsmin { };

     

       5740
       5554
        
       

     

       5741
       5555
        
         jsonpatch = callPackage ../development/python-modules/jsonpatch { };

     

       5556
       5556
       +
       

     

       5557
       5557
       +
         jsonpickle = callPackage ../development/python-modules/jsonpickle { };

     

       5742
       5558
        
       

     

       5743
       5559
        
         jsonpointer = buildPythonPackage rec {

     

       5744
       5560
        
           name = "jsonpointer-1.9";

     
···

       6845
       6661
        
       

     

       6846
       6662
        
         pysrt = callPackage ../development/python-modules/pysrt { };

     

       6847
       6663
        
       

     

       6848
       6848
       -
         pytools = buildPythonPackage rec {

     

       6849
       6849
       -
           name = "pytools-${version}";

     

       6850
       6850
       -
           version = "2017.4";

     

       6851
       6851
       -
       

     

       6852
       6852
       -
           src = pkgs.fetchFromGitHub {

     

       6853
       6853
       -
             owner = "inducer";

     

       6854
       6854
       -
             repo = "pytools";

     

       6855
       6855
       -
             rev = "8078e74265bb5a3c9676c698595ab5450cd2bfe7";

     

       6856
       6856
       -
             sha256 = "17q61l79fcxkj5jxg3fnymi652sdjp5s6kpsabgxp22kma9crr28";

     

       6857
       6857
       -
           };

     

       6858
       6858
       -
       

     

       6859
       6859
       -
           buildInputs = with self; [

     

       6860
       6860
       -
             decorator

     

       6861
       6861
       -
             appdirs

     

       6862
       6862
       -
             six

     

       6863
       6863
       -
             numpy

     

       6864
       6864
       -
             pytest

     

       6865
       6865
       -
           ];

     

       6866
       6866
       -
       

     

       6867
       6867
       -
           checkPhase = ''

     

       6868
       6868
       -
             py.test -k 'not test_persistent_dict'

     

       6869
       6869
       -
           '';

     

       6870
       6870
       -
       

     

       6871
       6871
       -
           meta = {

     

       6872
       6872
       -
             homepage = https://github.com/inducer/pytools/;

     

       6873
       6873
       -
             description = "Miscellaneous Python lifesavers.";

     

       6874
       6874
       -
             license = licenses.mit;

     

       6875
       6875
       -
             maintainers = with maintainers; [ artuuge ];

     

       6876
       6876
       -
           };

     

       6877
       6877
       -
       

     

       6878
       6878
       -
         };

     

       6664
       6664
       +
         pytools = callPackage ../development/python-modules/pytools { };

     

       6879
       6665
        
       

     

       6880
       6666
        
         pytun = buildPythonPackage rec {

     

       6881
       6667
        
           name = "pytun-${version}";

     
···

       7029
       6815
        
       

     

       7030
       6816
        
         hyperlink = callPackage ../development/python-modules/hyperlink {};

     

       7031
       6817
        
       

     

       7032
       7032
       -
         zope_copy = buildPythonPackage rec {

     

       7033
       7033
       -
           name = "zope.copy-4.0.2";

     

       7034
       7034
       -
       

     

       7035
       7035
       -
           src = pkgs.fetchurl {

     

       7036
       7036
       -
             url = "mirror://pypi/z/zope.copy/${name}.zip";

     

       7037
       7037
       -
             sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457";

     

       7038
       7038
       -
           };

     

       7039
       7039
       -
       

     

       7040
       7040
       -
           buildInputs = with self; [ zope_interface zope_location zope_schema ];

     

       7041
       7041
       -
       

     

       7042
       7042
       -
           meta = {

     

       7043
       7043
       -
             maintainers = with maintainers; [ domenkozar ];

     

       7044
       7044
       -
           };

     

       7045
       7045
       -
         };

     

       7046
       7046
       -
       

     

       6818
       6818
       +
         zope_copy = callPackage ../development/python-modules/zope_copy {};

     

       7047
       6819
        
       

     

       7048
       6820
        
         ssdeep = buildPythonPackage rec {

     

       7049
       6821
        
           name = "ssdeep-3.1.1";

     
···

       7229
       7001
        
           };

     

       7230
       7002
        
         };

     

       7231
       7003
        
       

     

       7232
       7232
       -
         regex = buildPythonPackage rec {

     

       7233
       7233
       -
           name = "regex-${version}";

     

       7234
       7234
       -
           version = "2016.11.18";

     

       7235
       7235
       -
       

     

       7236
       7236
       -
           src = pkgs.fetchurl {

     

       7237
       7237
       -
             url = "mirror://pypi/r/regex/${name}.tar.gz";

     

       7238
       7238
       -
             sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6";

     

       7239
       7239
       -
           };

     

       7240
       7240
       -
       

     

       7241
       7241
       -
           meta = {

     

       7242
       7242
       -
             description = "Alternative regular expression module, to replace re";

     

       7243
       7243
       -
             homepage = "https://bitbucket.org/mrabarnett/mrab-regex";

     

       7244
       7244
       -
             license = licenses.psfl;

     

       7245
       7245
       -
             platforms = platforms.linux;

     

       7246
       7246
       -
             maintainers = with maintainers; [ abbradar ];

     

       7247
       7247
       -
           };

     

       7248
       7248
       -
         };

     

       7004
       7004
       +
         regex = callPackage ../development/python-modules/regex { };

     

       7249
       7005
        
       

     

       7250
       7006
        
         repoze_lru = buildPythonPackage rec {

     

       7251
       7007
        
           name = "repoze.lru-0.6";

     
···

       7260
       7016
        
             platforms = platforms.all;

     

       7261
       7017
        
           };

     

       7262
       7018
        
         };

     

       7263
       7263
       -
       

     

       7264
       7264
       -
       

     

       7265
       7019
        
       

     

       7266
       7020
        
         repoze_sphinx_autointerface = buildPythonPackage rec {

     

       7267
       7021
        
           name = "repoze.sphinx.autointerface-0.7.1";

     
···

       9282
       9036
        
         };

     

       9283
       9037
        
       

     

       9284
       9038
        
       

     

       9285
       9285
       -
         html5lib = buildPythonPackage (rec {

     

       9286
       9286
       -
           version = "0.999999999";

     

       9287
       9287
       -
           name = "html5lib-${version}";

     

       9288
       9288
       -
       

     

       9289
       9289
       -
           src = pkgs.fetchurl {

     

       9290
       9290
       -
             url = "http://github.com/html5lib/html5lib-python/archive/${version}.tar.gz";

     

       9291
       9291
       -
             sha256 = "09j6194f5mlnd5xwbavwvnndwl1x91jw74shxl6hcxjp4fxg3h05";

     

       9292
       9292
       -
           };

     

       9293
       9293
       -
       

     

       9294
       9294
       -
           buildInputs = with self; [ flake8 pytest pytest-expect mock ];

     

       9295
       9295
       -
           propagatedBuildInputs = with self; [

     

       9296
       9296
       -
             six webencodings

     

       9297
       9297
       -
           ] ++ optionals isPy26 [ ordereddict ];

     

       9298
       9298
       -
       

     

       9299
       9299
       -
           checkPhase = ''

     

       9300
       9300
       -
             py.test

     

       9301
       9301
       -
           '';

     

       9302
       9302
       -
       

     

       9303
       9303
       -
           meta = {

     

       9304
       9304
       -
             homepage = https://github.com/html5lib/html5lib-python;

     

       9305
       9305
       -
             downloadPage = https://github.com/html5lib/html5lib-python/releases;

     

       9306
       9306
       -
             description = "HTML parser based on WHAT-WG HTML5 specification";

     

       9307
       9307
       -
             longDescription = ''

     

       9308
       9308
       -
               html5lib is a pure-python library for parsing HTML. It is designed to

     

       9309
       9309
       -
               conform to the WHATWG HTML specification, as is implemented by all

     

       9310
       9310
       -
               major web browsers.

     

       9311
       9311
       -
             '';

     

       9312
       9312
       -
             license = licenses.mit;

     

       9313
       9313
       -
             maintainers = with maintainers; [ domenkozar prikhi ];

     

       9314
       9314
       -
           };

     

       9315
       9315
       -
         });

     

       9039
       9039
       +
         html5lib = callPackage ../development/python-modules/html5lib { };

     

       9316
       9040
        
       

     

       9317
       9041
        
         http_signature = buildPythonPackage (rec {

     

       9318
       9042
        
           name = "http_signature-0.1.4";

     
···

       9751
       9475
        
       

     

       9752
       9476
        
         iso3166 = callPackage ../development/python-modules/iso3166 {};

     

       9753
       9477
        
       

     

       9754
       9754
       -
         iso8601 = buildPythonPackage rec {

     

       9755
       9755
       -
           name = "iso8601-${version}";

     

       9756
       9756
       -
           version = "0.1.11";

     

       9757
       9757
       -
           src = pkgs.fetchurl {

     

       9758
       9758
       -
             url = "mirror://pypi/i/iso8601/${name}.tar.gz";

     

       9759
       9759
       -
             sha256 = "e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30";

     

       9760
       9760
       -
           };

     

       9761
       9761
       -
       

     

       9762
       9762
       -
           buildInputs = [ self.pytest ];

     

       9763
       9763
       -
       

     

       9764
       9764
       -
           checkPhase = ''

     

       9765
       9765
       -
             py.test iso8601

     

       9766
       9766
       -
           '';

     

       9767
       9767
       -
       

     

       9768
       9768
       -
           meta = {

     

       9769
       9769
       -
             homepage = https://bitbucket.org/micktwomey/pyiso8601/;

     

       9770
       9770
       -
             description = "Simple module to parse ISO 8601 dates";

     

       9771
       9771
       -
             maintainers = with maintainers; [ phreedom ];

     

       9772
       9772
       -
           };

     

       9773
       9773
       -
         };

     

       9478
       9478
       +
         iso8601 = callPackage ../development/python-modules/iso8601 { };

     

       9774
       9479
        
       

     

       9775
       9480
        
         isort = buildPythonPackage rec {

     

       9776
       9481
        
           name = "${pname}-${version}";

     
···

       9795
       9500
        
       

     

       9796
       9501
        
         jedi = callPackage ../development/python-modules/jedi { };

     

       9797
       9502
        
       

     

       9798
       9798
       -
         jellyfish = buildPythonPackage rec {

     

       9799
       9799
       -
           version = "0.5.2";

     

       9800
       9800
       -
           name = "jellyfish-${version}";

     

       9801
       9801
       -
       

     

       9802
       9802
       -
           src = pkgs.fetchurl {

     

       9803
       9803
       -
             url = "mirror://pypi/j/jellyfish/${name}.tar.gz";

     

       9804
       9804
       -
             sha256 = "15xk0kbr1gig9r1mp22lk9mk3jyi886h8ywn9diixhnyl4q6dacn";

     

       9805
       9805
       -
           };

     

       9806
       9806
       -
       

     

       9807
       9807
       -
           buildInputs = with self; [ pytest unicodecsv ];

     

       9808
       9808
       -
       

     

       9809
       9809
       -
           meta = {

     

       9810
       9810
       -
             homepage = https://github.com/sunlightlabs/jellyfish;

     

       9811
       9811
       -
             description = "Approximate and phonetic matching of strings";

     

       9812
       9812
       -
             maintainers = with maintainers; [ koral ];

     

       9813
       9813
       -
           };

     

       9814
       9814
       -
         };

     

       9503
       9503
       +
         jellyfish = callPackage ../development/python-modules/jellyfish { };

     

       9815
       9504
        
       

     

       9816
       9505
        
         j2cli = buildPythonPackage rec {

     

       9817
       9506
        
           name = "j2cli-${version}";

     
···

       9884
       9573
        
         };

     

       9885
       9574
        
       

     

       9886
       9575
        
         jsondate = callPackage ../development/python-modules/jsondate { };

     

       9576
       9576
       +
       

     

       9577
       9577
       +
         jsondiff = callPackage ../development/python-modules/jsondiff { };

     

       9887
       9578
        
       

     

       9888
       9579
        
         jsonnet = buildPythonPackage {

     

       9889
       9580
        
           inherit (pkgs.jsonnet) name src;

     
···

       9980
       9671
        
         };

     

       9981
       9672
        
       

     

       9982
       9673
        
         koji = callPackage ../development/python-modules/koji { };

     

       9983
       9983
       -
       

     

       9984
       9984
       -
         kombu_3 = buildPythonPackage rec {

     

       9985
       9985
       -
           name = "kombu-${version}";

     

       9986
       9986
       -
           version = "3.0.35";

     

       9987
       9987
       -
       

     

       9988
       9988
       -
           disabled = pythonOlder "2.6";

     

       9989
       9989
       -
       

     

       9990
       9990
       -
           src = pkgs.fetchurl {

     

       9991
       9991
       -
             url = "mirror://pypi/k/kombu/${name}.tar.gz";

     

       9992
       9992
       -
             sha256 = "09xpxpjz9nk8d14dj361dqdwyjwda3jlf1a7v6jif9wn2xm37ar2";

     

       9993
       9993
       -
           };

     

       9994
       9994
       -
       

     

       9995
       9995
       -
           # most of these are simply to allow the test suite to do its job

     

       9996
       9996
       -
           buildInputs = with self; optionals isPy27 [ mock unittest2 nose redis qpid-python pymongo sqlalchemy pyyaml msgpack boto ];

     

       9997
       9997
       -
       

     

       9998
       9998
       -
           propagatedBuildInputs = with self; [ amqp_1 anyjson ] ++

     

       9999
       9999
       -
             (optionals (pythonOlder "2.7") [ importlib ordereddict ]);

     

       10000
       10000
       -
       

     

       10001
       10001
       -
           # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806

     

       10002
       10002
       -
           doCheck = isPy27;

     

       10003
       10003
       -
       

     

       10004
       10004
       -
           meta = {

     

       10005
       10005
       -
             description = "Messaging library for Python";

     

       10006
       10006
       -
             homepage    = "http://github.com/celery/kombu";

     

       10007
       10007
       -
             license     = licenses.bsd3;

     

       10008
       10008
       -
           };

     

       10009
       10009
       -
         };

     

       10010
       9674
        
       

     

       10011
       9675
        
         kombu = buildPythonPackage rec {

     

       10012
       9676
        
           name = "kombu-${version}";

     
···

       10294
       9958
        
       

     

       10295
       9959
        
         locustio = callPackage ../development/python-modules/locustio { };

     

       10296
       9960
        
       

     

       10297
       10297
       -
         llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_4;};

     

       9961
       9961
       +
         llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_5;};

     

       10298
       9962
        
       

     

       10299
       9963
        
         lockfile = buildPythonPackage rec {

     

       10300
       9964
        
           pname = "lockfile";

     
···

       10324
       9988
        
       

     

       10325
       9989
        
         logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {};

     

       10326
       9990
        
       

     

       10327
       10327
       -
         lxml = buildPythonPackage ( rec {

     

       10328
       10328
       -
           name = "lxml-3.8.0";

     

       10329
       10329
       -
       

     

       10330
       10330
       -
           src = pkgs.fetchurl {

     

       10331
       10331
       -
             url = "mirror://pypi/l/lxml/${name}.tar.gz";

     

       10332
       10332
       -
             sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk";

     

       10333
       10333
       -
           };

     

       10334
       10334
       -
       

     

       10335
       10335
       -
           buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];

     

       10336
       10336
       -
       

     

       10337
       10337
       -
           hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";

     

       10338
       10338
       -
       

     

       10339
       10339
       -
           meta = {

     

       10340
       10340
       -
             description = "Pythonic binding for the libxml2 and libxslt libraries";

     

       10341
       10341
       -
             homepage = http://lxml.de;

     

       10342
       10342
       -
             license = licenses.bsd3;

     

       10343
       10343
       -
             maintainers = with maintainers; [ sjourdois ];

     

       10344
       10344
       -
           };

     

       10345
       10345
       -
         });

     

       9991
       9991
       +
         lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;};

     

       10346
       9992
        
       

     

       10347
       9993
        
         lxc = buildPythonPackage (rec {

     

       10348
       9994
        
           name = "python-lxc-unstable-2016-08-25";

     
···

       10439
       10085
        
           };

     

       10440
       10086
        
         };

     

       10441
       10087
        
       

     

       10442
       10442
       -
       

     

       10443
       10443
       -
         Mako = buildPythonPackage rec {

     

       10444
       10444
       -
           name = "Mako-1.0.4";

     

       10445
       10445
       -
       

     

       10446
       10446
       -
           src = pkgs.fetchurl {

     

       10447
       10447
       -
             url = "mirror://pypi/M/Mako/${name}.tar.gz";

     

       10448
       10448
       -
             sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy";

     

       10449
       10449
       -
           };

     

       10450
       10450
       -
       

     

       10451
       10451
       -
           buildInputs = with self; [ markupsafe nose mock pytest ];

     

       10452
       10452
       -
           propagatedBuildInputs = with self; [ markupsafe ];

     

       10453
       10453
       -
       

     

       10454
       10454
       -
           doCheck = !isPyPy;  # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25

     

       10455
       10455
       -
       

     

       10456
       10456
       -
           meta = {

     

       10457
       10457
       -
             description = "Super-fast templating language";

     

       10458
       10458
       -
             homepage = http://www.makotemplates.org;

     

       10459
       10459
       -
             license = licenses.mit;

     

       10460
       10460
       -
             platforms = platforms.unix;

     

       10461
       10461
       -
             maintainers = with maintainers; [ domenkozar ];

     

       10462
       10462
       -
           };

     

       10463
       10463
       -
         };

     

       10088
       10088
       +
         Mako = callPackage ../development/python-modules/Mako { };

     

       10464
       10089
        
       

     

       10465
       10090
        
         manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {};

     

       10466
       10091
        
         marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {};

     
···

       10517
       10142
        
           };

     

       10518
       10143
        
         };

     

       10519
       10144
        
       

     

       10520
       10520
       -
         markdown = buildPythonPackage rec {

     

       10521
       10521
       -
           version = "2.6.8";

     

       10522
       10522
       -
           name = "markdown-${version}";

     

       10523
       10523
       -
       

     

       10524
       10524
       -
           src = pkgs.fetchurl {

     

       10525
       10525
       -
             url = "mirror://pypi/M/Markdown/Markdown-${version}.tar.gz";

     

       10526
       10526
       -
             sha256 = "0cqfhr1km2s5d8jm6hbwgkrrj9hvkjf2gab3s2axlrw1clgaij0a";

     

       10527
       10527
       -
           };

     

       10528
       10528
       -
       

     

       10529
       10529
       -
           # error: invalid command 'test'

     

       10530
       10530
       -
           doCheck = false;

     

       10531
       10531
       -
       

     

       10532
       10532
       -
           meta = {

     

       10533
       10533
       -
             homepage = http://www.freewisdom.org/projects/python-markdown;

     

       10534
       10534
       -
           };

     

       10535
       10535
       -
         };

     

       10145
       10145
       +
         markdown = callPackage ../development/python-modules/markdown { };

     

       10536
       10146
        
       

     

       10537
       10147
        
         markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {};

     

       10538
       10148
        
       

     
···

       10890
       10500
        
       

     

       10891
       10501
        
         mistune = callPackage ../development/python-modules/mistune { };

     

       10892
       10502
        
       

     

       10893
       10893
       -
         brotlipy = buildPythonPackage rec {

     

       10894
       10894
       -
           name = "brotlipy-${version}";

     

       10895
       10895
       -
           version = "0.6.0";

     

       10896
       10896
       -
       

     

       10897
       10897
       -
           src = pkgs.fetchurl {

     

       10898
       10898
       -
             url = "mirror://pypi/b/brotlipy/${name}.tar.gz";

     

       10899
       10899
       -
             sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016";

     

       10900
       10900
       -
           };

     

       10901
       10901
       -
       

     

       10902
       10902
       -
           propagatedBuildInputs = with self; [ cffi enum34 construct ];

     

       10903
       10903
       -
       

     

       10904
       10904
       -
           meta = {

     

       10905
       10905
       -
             description = "Python bindings for the reference Brotli encoder/decoder";

     

       10906
       10906
       -
             homepage = "https://github.com/python-hyper/brotlipy/";

     

       10907
       10907
       -
             license = licenses.mit;

     

       10908
       10908
       -
           };

     

       10909
       10909
       -
         };

     

       10503
       10503
       +
         brotlipy = callPackage ../development/python-modules/brotlipy { };

     

       10910
       10504
        
       

     

       10911
       10505
        
         sortedcontainers = buildPythonPackage rec {

     

       10912
       10506
        
           name = "sortedcontainers-${version}";

     
···

       11545
       11139
        
             sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";

     

       11546
       11140
        
           };

     

       11547
       11141
        
       

     

       11548
       11548
       -
           buildInputs = with self; [ nose pkgs.openssl ];

     

       11142
       11142
       +
           buildInputs = with self; [ nose ];

     

       11549
       11143
        
       

     

       11550
       11550
       -
           propagatedBuildInputs = with self; [ pkgs.mysql.lib pkgs.zlib ];

     

       11144
       11144
       +
           propagatedBuildInputs = with self; [ pkgs.mysql.connector-c ];

     

       11551
       11145
        
       

     

       11552
       11146
        
           meta = {

     

       11553
       11147
        
             description = "MySQL database binding for Python";

     
···

       12446
       12040
        
           };

     

       12447
       12041
        
         };

     

       12448
       12042
        
       

     

       12043
       12043
       +
         plone-testing = callPackage ../development/python-modules/plone-testing { };

     

       12044
       12044
       +
       

     

       12449
       12045
        
         ply = buildPythonPackage (rec {

     

       12450
       12046
        
           name = "ply-3.8";

     

       12451
       12047
        
       

     
···

       13043
       12639
        
       

     

       13044
       12640
        
         parso = callPackage ../development/python-modules/parso { };

     

       13045
       12641
        
       

     

       13046
       13046
       -
         partd = buildPythonPackage rec {

     

       13047
       13047
       -
           name = "partd-${version}";

     

       13048
       13048
       -
           version = "0.3.7";

     

       13049
       13049
       -
       

     

       13050
       13050
       -
           src = pkgs.fetchurl {

     

       13051
       13051
       -
             url = "mirror://pypi/p/partd/${name}.tar.gz";

     

       13052
       13052
       -
             sha256 = "066d254d2dh9xcanffgkjgwxpz5v0059b063bij10fvzl2y49hzx";

     

       13053
       13053
       -
           };

     

       13054
       13054
       -
       

     

       13055
       13055
       -
           buildInputs = with self; [ pytest ];

     

       13056
       13056
       -
       

     

       13057
       13057
       -
           propagatedBuildInputs = with self; [ locket numpy pandas pyzmq toolz ];

     

       13058
       13058
       -
       

     

       13059
       13059
       -
           checkPhase = ''

     

       13060
       13060
       -
             rm partd/tests/test_zmq.py # requires network & fails

     

       13061
       13061
       -
             py.test

     

       13062
       13062
       -
           '';

     

       13063
       13063
       -
       

     

       13064
       13064
       -
           meta = {

     

       13065
       13065
       -
             description = "Appendable key-value storage";

     

       13066
       13066
       -
             license = with licenses; [ bsd3 ];

     

       13067
       13067
       -
             homepage = https://github.com/dask/partd/;

     

       13068
       13068
       -
           };

     

       13069
       13069
       -
         };

     

       12642
       12642
       +
         partd = callPackage ../development/python-modules/partd { };

     

       13070
       12643
        
       

     

       13071
       12644
        
         patch = buildPythonPackage rec {

     

       13072
       12645
        
           name = "${pname}-${version}";

     
···

       15675
       15248
        
       

     

       15676
       15249
        
         pyxattr = callPackage ../development/python-modules/pyxattr { };

     

       15677
       15250
        
       

     

       15678
       15678
       -
         pyaml = buildPythonPackage (rec {

     

       15679
       15679
       -
           name = "pyaml-15.02.1";

     

       15680
       15680
       -
           disabled = !isPy27;

     

       15681
       15681
       -
       

     

       15682
       15682
       -
           src = pkgs.fetchurl {

     

       15683
       15683
       -
             url = "mirror://pypi/p/pyaml/${name}.tar.gz";

     

       15684
       15684
       -
             sha256 = "8dfe1b295116115695752acc84d15ecf5c1c469975fbed7672bf41a6bc6d6d51";

     

       15685
       15685
       -
           };

     

       15686
       15686
       -
       

     

       15687
       15687
       -
           buildInputs = with self; [ pyyaml ];

     

       15688
       15688
       -
       

     

       15689
       15689
       -
           meta = {

     

       15690
       15690
       -
             description = "PyYAML-based module to produce pretty and readable YAML-serialized data";

     

       15691
       15691
       -
             homepage = https://github.com/mk-fg/pretty-yaml;

     

       15692
       15692
       -
           };

     

       15693
       15693
       -
         });

     

       15694
       15694
       -
       

     

       15251
       15251
       +
         pyaml = callPackage ../development/python-modules/pyaml { };

     

       15695
       15252
        
       

     

       15696
       15253
        
         pyyaml = buildPythonPackage (rec {

     

       15697
       15254
        
           name = "PyYAML-3.12";

     
···

       17759
       17316
        
           };

     

       17760
       17317
        
         });

     

       17761
       17318
        
       

     

       17319
       17319
       +
         splinter = callPackage ../development/python-modules/splinter { };

     

       17320
       17320
       +
       

     

       17762
       17321
        
         spotipy = callPackage ../development/python-modules/spotipy { };

     

       17763
       17322
        
       

     

       17764
       17323
        
         Pweave = buildPythonPackage (rec {

     
···

       17991
       17550
        
           };

     

       17992
       17551
        
         };

     

       17993
       17552
        
       

     

       17994
       17994
       -
         structlog = buildPythonPackage rec {

     

       17995
       17995
       -
           name = "structlog-16.1.0";

     

       17996
       17996
       -
       

     

       17997
       17997
       -
           src = pkgs.fetchurl {

     

       17998
       17998
       -
             url = "mirror://pypi/s/structlog/${name}.tar.gz";

     

       17999
       17999
       -
             sha256 = "00dywyg3bqlkrmbrfrql21hpjjjkc4zjd6xxjyxyd15brfnzlkdl";

     

       18000
       18000
       -
           };

     

       18001
       18001
       -
       

     

       18002
       18002
       -
           buildInputs = with self; [ pytest pretend freezegun ];

     

       18003
       18003
       -
           propagatedBuildInputs = with self; [ simplejson ];

     

       18004
       18004
       -
       

     

       18005
       18005
       -
           checkPhase = ''

     

       18006
       18006
       -
             rm tests/test_twisted.py*

     

       18007
       18007
       -
             py.test

     

       18008
       18008
       -
           '';

     

       18009
       18009
       -
       

     

       18010
       18010
       -
           meta = {

     

       18011
       18011
       -
             description = "Painless structural logging";

     

       18012
       18012
       -
             homepage = http://www.structlog.org/;

     

       18013
       18013
       -
             license = licenses.asl20;

     

       18014
       18014
       -
           };

     

       18015
       18015
       -
         };

     

       17553
       17553
       +
         structlog = callPackage ../development/python-modules/structlog { };

     

       18016
       17554
        
       

     

       18017
       17555
        
         svgwrite = buildPythonPackage rec {

     

       18018
       17556
        
           name = "svgwrite-${version}";

     
···

       18296
       17834
        
         };

     

       18297
       17835
        
       

     

       18298
       17836
        
       

     

       18299
       18299
       -
         extras = buildPythonPackage rec {

     

       18300
       18300
       -
           name = "extras-${version}";

     

       18301
       18301
       -
           version = "0.0.3";

     

       17837
       17837
       +
         extras = callPackage ../development/python-modules/extras { };

     

       18302
       17838
        
       

     

       18303
       18303
       -
           src = pkgs.fetchurl {

     

       18304
       18304
       -
             url = "mirror://pypi/e/extras/extras-${version}.tar.gz";

     

       18305
       18305
       -
             sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s";

     

       18306
       18306
       -
           };

     

       18307
       18307
       -
       

     

       18308
       18308
       -
           # error: invalid command 'test'

     

       18309
       18309
       -
           doCheck = false;

     

       18310
       18310
       -
       

     

       18311
       18311
       -
           meta = {

     

       18312
       18312
       -
             description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges";

     

       18313
       18313
       -
             homepage = https://code.google.com/p/mimeparse/;

     

       18314
       18314
       -
             license = licenses.mit;

     

       18315
       18315
       -
           };

     

       18316
       18316
       -
         };

     

       18317
       18317
       -
       

     

       18318
       18318
       -
         texttable = self.buildPythonPackage rec {

     

       18319
       18319
       -
           name = "texttable-0.8.4";

     

       18320
       18320
       -
       

     

       18321
       18321
       -
           src = pkgs.fetchurl {

     

       18322
       18322
       -
             url = "mirror://pypi/t/texttable/${name}.tar.gz";

     

       18323
       18323
       -
             sha256 = "0bkhs4dx9s6g7fpb969hygq56hyz4ncfamlynw72s0n6nqfbd1w5";

     

       18324
       18324
       -
           };

     

       18325
       18325
       -
       

     

       18326
       18326
       -
           meta = {

     

       18327
       18327
       -
             description = "A module to generate a formatted text table, using ASCII characters";

     

       18328
       18328
       -
             homepage = http://foutaise.org/code/;

     

       18329
       18329
       -
             license = licenses.lgpl2;

     

       18330
       18330
       -
           };

     

       18331
       18331
       -
         };

     

       17839
       17839
       +
         texttable = callPackage ../development/python-modules/texttable { };

     

       18332
       17840
        
       

     

       18333
       17841
        
         tiros = callPackage ../development/python-modules/tiros { };

     

       18334
       17842
        
       

     
···

       18411
       17919
        
       

     

       18412
       17920
        
         toolz = callPackage ../development/python-modules/toolz { };

     

       18413
       17921
        
       

     

       18414
       18414
       -
         tox = buildPythonPackage rec {

     

       18415
       18415
       -
           name = "tox-${version}";

     

       18416
       18416
       -
           version = "2.4.1";

     

       18417
       18417
       -
       

     

       18418
       18418
       -
           propagatedBuildInputs = with self; [ py virtualenv pluggy ];

     

       18419
       18419
       -
       

     

       18420
       18420
       -
           doCheck = false;

     

       18421
       18421
       -
       

     

       18422
       18422
       -
           src = pkgs.fetchurl {

     

       18423
       18423
       -
             url = "mirror://pypi/t/tox/${name}.tar.gz";

     

       18424
       18424
       -
             sha256 = "1nwn4jz8ns53n17bm1xkzlz4zyyxbgjwrcg2cjsn25ab7hd5fwv6";

     

       18425
       18425
       -
           };

     

       18426
       18426
       -
         };

     

       17922
       17922
       +
         tox = callPackage ../development/python-modules/tox { };

     

       18427
       17923
        
       

     

       18428
       17924
        
         tqdm = callPackage ../development/python-modules/tqdm { };

     

       18429
       17925
        
       

     
···

       21385
       20881
        
           };

     

       21386
       20882
        
         };

     

       21387
       20883
        
       

     

       21388
       21388
       -
         networkx = buildPythonPackage rec {

     

       21389
       21389
       -
           version = "1.11";

     

       21390
       21390
       -
           name = "networkx-${version}";

     

       21391
       21391
       -
       

     

       21392
       21392
       -
           # Currently broken on PyPy.

     

       21393
       21393
       -
           # https://github.com/networkx/networkx/pull/1361

     

       21394
       21394
       -
           disabled = isPyPy;

     

       21395
       21395
       -
       

     

       21396
       21396
       -
           src = pkgs.fetchurl {

     

       21397
       21397
       -
             url = "mirror://pypi/n/networkx/${name}.tar.gz";

     

       21398
       21398
       -
             sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd";

     

       21399
       21399
       -
           };

     

       21400
       21400
       -
       

     

       21401
       21401
       -
           buildInputs = with self; [ nose ];

     

       21402
       21402
       -
           propagatedBuildInputs = with self; [ decorator ];

     

       21403
       21403
       -
       

     

       21404
       21404
       -
           # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299

     

       21405
       21405
       -
           doCheck = !(isPy36);

     

       21406
       21406
       -
       

     

       21407
       21407
       -
           meta = {

     

       21408
       21408
       -
             homepage = "https://networkx.github.io/";

     

       21409
       21409
       -
             description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks";

     

       21410
       21410
       -
             license = licenses.bsd3;

     

       21411
       21411
       -
           };

     

       21412
       21412
       -
         };

     

       20884
       20884
       +
         networkx = callPackage ../development/python-modules/networkx { };

     

       21413
       20885
        
       

     

       21414
       20886
        
         ofxclient = callPackage ../development/python-modules/ofxclient {};

     

       21415
       20887
        
       

     
···

       21886
       21358
        
           };

     

       21887
       21359
        
         };

     

       21888
       21360
        
       

     

       21889
       21889
       -
         pluggy = buildPythonPackage rec {

     

       21890
       21890
       -
           name = "pluggy-${version}";

     

       21891
       21891
       -
           version = "0.3.1";

     

       21892
       21892
       -
       

     

       21893
       21893
       -
           src = pkgs.fetchurl {

     

       21894
       21894
       -
             url = "mirror://pypi/p/pluggy/${name}.tar.gz";

     

       21895
       21895
       -
             sha256 = "18qfzfm40bgx672lkg8q9x5hdh76n7vax99aank7vh2nw21wg70m";

     

       21896
       21896
       -
           };

     

       21897
       21897
       -
       

     

       21898
       21898
       -
           meta = {

     

       21899
       21899
       -
             description = "Plugin and hook calling mechanisms for Python";

     

       21900
       21900
       -
             homepage = "https://pypi.python.org/pypi/pluggy";

     

       21901
       21901
       -
             license = licenses.mit;

     

       21902
       21902
       -
             maintainers = with maintainers; [ jgeerds ];

     

       21903
       21903
       -
           };

     

       21904
       21904
       -
         };

     

       21361
       21361
       +
         pluggy = callPackage ../development/python-modules/pluggy {};

     

       21905
       21362
        
       

     

       21906
       21363
        
         xcffib = buildPythonPackage rec {

     

       21907
       21364
        
           version = "0.3.2";

+53 -16

pkgs/top-level/splice.nix

···

       24
       24
        
       lib: pkgs: actuallySplice:

     

       25
       25
        
       

     

       26
       26
        
       let

     

       27
       27
       -
         defaultBuildScope = pkgs.buildPackages // pkgs.buildPackages.xorg;

     

       27
       27
       +
         defaultBuildBuildScope = pkgs.buildPackages.buildPackages // pkgs.buildPackages.buildPackages.xorg;

     

       28
       28
       +
         defaultBuildHostScope = pkgs.buildPackages // pkgs.buildPackages.xorg;

     

       29
       29
       +
         defaultBuildTargetScope =

     

       30
       30
       +
           if pkgs.targetPlatform == pkgs.hostPlatform

     

       31
       31
       +
           then defaultBuildHostScope

     

       32
       32
       +
           else assert pkgs.hostPlatform == pkgs.buildPlatform; defaultHostTargetScope;

     

       33
       33
       +
         defaultHostHostScope = {}; # unimplemented

     

       28
       34
        
         # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing

     

       29
       35
        
         # these attributes. We should have a more general solution for selecting

     

       30
       36
        
         # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`.

     

       31
       37
        
         pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs;

     

       32
       32
       -
         defaultRunScope = pkgsWithoutFetchers // pkgs.xorg;

     

       38
       38
       +
         targetPkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs.targetPackages;

     

       39
       39
       +
         defaultHostTargetScope = pkgsWithoutFetchers // pkgs.xorg;

     

       40
       40
       +
         defaultTargetTargetScope = targetPkgsWithoutFetchers // targetPkgsWithoutFetchers.xorg or {};

     

       33
       41
        
       

     

       34
       34
       -
         splicer = buildPkgs: runPkgs: let

     

       35
       35
       -
           mash = buildPkgs // runPkgs;

     

       42
       42
       +
         splicer = pkgsBuildBuild: pkgsBuildHost: pkgsBuildTarget:

     

       43
       43
       +
                   pkgsHostHost: pkgsHostTarget:

     

       44
       44
       +
                   pkgsTargetTarget: let

     

       45
       45
       +
           mash =

     

       46
       46
       +
             # Other pkgs sets

     

       47
       47
       +
             pkgsBuildBuild // pkgsBuildTarget // pkgsHostHost // pkgsTargetTarget

     

       48
       48
       +
             # The same pkgs sets one probably intends

     

       49
       49
       +
             // pkgsBuildHost // pkgsHostTarget;

     

       36
       50
        
           merge = name: {

     

       37
       51
        
             inherit name;

     

       38
       52
        
             value = let

     

       39
       53
        
               defaultValue = mash.${name};

     

       40
       54
        
               # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.

     

       41
       41
       -
               buildValue = buildPkgs.${name} or {};

     

       42
       42
       -
               runValue = runPkgs.${name} or {};

     

       55
       55
       +
               valueBuildBuild = pkgsBuildBuild.${name} or {};

     

       56
       56
       +
               valueBuildHost = pkgsBuildHost.${name} or {};

     

       57
       57
       +
               valueBuildTarget = pkgsBuildTarget.${name} or {};

     

       58
       58
       +
               valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splicer.";

     

       59
       59
       +
               valueHostTarget = pkgsHostTarget.${name} or {};

     

       60
       60
       +
               valueTargetTarget = pkgsTargetTarget.${name} or {};

     

       43
       61
        
               augmentedValue = defaultValue

     

       44
       44
       -
                 // (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; })

     

       45
       45
       -
                 // (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; });

     

       62
       62
       +
                 # TODO(@Ericson2314): Stop using old names after transition period

     

       63
       63
       +
                 // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = valueBuildHost; })

     

       64
       64
       +
                 // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = valueHostTarget; })

     

       65
       65
       +
                 // {

     

       66
       66
       +
                   __spliced =

     

       67
       67
       +
                        (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })

     

       68
       68
       +
                     // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })

     

       69
       69
       +
                     // { hostHost = valueHostHost; }

     

       70
       70
       +
                     // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget;

     

       71
       71
       +
                 });

     

       72
       72
       +
               };

     

       46
       73
        
               # Get the set of outputs of a derivation. If one derivation fails to

     

       47
       74
        
               # evaluate we don't want to diverge the entire splice, so we fall back

     

       48
       75
        
               # on {}

     
···

       55
       82
        
             in

     

       56
       83
        
               # The derivation along with its outputs, which we recur

     

       57
       84
        
               # on to splice them together.

     

       58
       58
       -
               if lib.isDerivation defaultValue then augmentedValue

     

       59
       59
       -
                 // splicer (tryGetOutputs buildValue) (getOutputs runValue)

     

       85
       85
       +
               if lib.isDerivation defaultValue then augmentedValue // splicer

     

       86
       86
       +
                 (tryGetOutputs valueBuildBuild) (tryGetOutputs valueBuildHost) (tryGetOutputs valueBuildTarget)

     

       87
       87
       +
                 (tryGetOutputs valueHostHost) (getOutputs valueHostTarget)

     

       88
       88
       +
                 (tryGetOutputs valueTargetTarget)

     

       60
       89
        
               # Just recur on plain attrsets

     

       61
       61
       -
               else if lib.isAttrs defaultValue then splicer buildValue runValue

     

       90
       90
       +
               else if lib.isAttrs defaultValue then splicer

     

       91
       91
       +
                 valueBuildBuild valueBuildHost valueBuildTarget

     

       92
       92
       +
                 {} valueHostTarget

     

       93
       93
       +
                 valueTargetTarget

     

       62
       94
        
               # Don't be fancy about non-derivations. But we could have used used

     

       63
       95
        
               # `__functor__` for functions instead.

     

       64
       96
        
               else defaultValue;

     
···

       67
       99
        
       

     

       68
       100
        
         splicedPackages =

     

       69
       101
        
           if actuallySplice

     

       70
       70
       -
           then splicer defaultBuildScope defaultRunScope // {

     

       71
       71
       -
             # These should never be spliced under any circumstances

     

       72
       72
       -
             inherit (pkgs) pkgs buildPackages targetPackages

     

       73
       73
       -
               buildPlatform targetPlatform hostPlatform;

     

       74
       74
       -
           }

     

       102
       102
       +
           then

     

       103
       103
       +
             splicer

     

       104
       104
       +
               defaultBuildBuildScope defaultBuildHostScope defaultBuildTargetScope

     

       105
       105
       +
               defaultHostHostScope defaultHostTargetScope

     

       106
       106
       +
               defaultTargetTargetScope

     

       107
       107
       +
             // {

     

       108
       108
       +
               # These should never be spliced under any circumstances

     

       109
       109
       +
               inherit (pkgs) pkgs buildPackages targetPackages

     

       110
       110
       +
                 buildPlatform targetPlatform hostPlatform;

     

       111
       111
       +
             }

     

       75
       112
        
           else pkgs // pkgs.xorg;

     

       76
       113
        
       

     

       77
       114
        
       in