commit 455ce3528c9caddf4aea774388707da13bf52ef3 · pyrox.dev/nixpkgs

+12

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

···

       49
       49
        
             rest of the system on a stable release.

     

       50
       50
        
           </para>

     

       51
       51
        
         </listitem>

     

       52
       52
       +
         <listitem>

     

       53
       53
       +
           <para>

     

       54
       54
       +
             Updated to FreeType 2.7.1, including a new TrueType engine.

     

       55
       55
       +
             The new engine replaces the Infinality engine which was the default in

     

       56
       56
       +
             NixOS. The default font rendering settings are now provided by

     

       57
       57
       +
             fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults

     

       58
       58
       +
             are less invasive and provide rendering that is more consistent with

     

       59
       59
       +
             other systems and hopefully with each font designer's intent. Some

     

       60
       60
       +
             system-wide configuration has been removed from the Fontconfig NixOS

     

       61
       61
       +
             module where user Fontconfig settings are available.

     

       62
       62
       +
           </para>

     

       63
       63
       +
         </listitem>

     

       52
       64
        
       

     

       53
       65
        
       </itemizedlist>

     

       54
       66

+57

nixos/modules/config/fonts/fontconfig-penultimate.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.fonts.fontconfig.penultimate;

     

       7
       7
       +
       

     

       8
       8
       +
         latestVersion  = pkgs.fontconfig.configVersion;

     

       9
       9
       +
       

     

       10
       10
       +
         # The configuration to be included in /etc/font/

     

       11
       11
       +
         confPkg = pkgs.runCommand "font-penultimate-conf" {} ''

     

       12
       12
       +
           support_folder=$out/etc/fonts/conf.d

     

       13
       13
       +
           latest_folder=$out/etc/fonts/${latestVersion}/conf.d

     

       14
       14
       +
       

     

       15
       15
       +
           mkdir -p $support_folder

     

       16
       16
       +
           mkdir -p $latest_folder

     

       17
       17
       +
       

     

       18
       18
       +
           # fontconfig ultimate various configuration files

     

       19
       19
       +
           ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \

     

       20
       20
       +
                 $support_folder

     

       21
       21
       +
           ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \

     

       22
       22
       +
                 $latest_folder

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       25
       25
       +
       in

     

       26
       26
       +
       {

     

       27
       27
       +
       

     

       28
       28
       +
         options = {

     

       29
       29
       +
       

     

       30
       30
       +
           fonts = {

     

       31
       31
       +
       

     

       32
       32
       +
             fontconfig = {

     

       33
       33
       +
       

     

       34
       34
       +
               penultimate = {

     

       35
       35
       +
                 enable = mkOption {

     

       36
       36
       +
                   type = types.bool;

     

       37
       37
       +
                   default = true;

     

       38
       38
       +
                   description = ''

     

       39
       39
       +
                     Enable fontconfig-penultimate settings to supplement the

     

       40
       40
       +
                     NixOS defaults by providing per-font rendering defaults and

     

       41
       41
       +
                     metric aliases.

     

       42
       42
       +
                   '';

     

       43
       43
       +
                 };

     

       44
       44
       +
               };

     

       45
       45
       +
       

     

       46
       46
       +
             };

     

       47
       47
       +
           };

     

       48
       48
       +
       

     

       49
       49
       +
         };

     

       50
       50
       +
       

     

       51
       51
       +
         config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {

     

       52
       52
       +
       

     

       53
       53
       +
           fonts.fontconfig.confPackages = [ confPkg ];

     

       54
       54
       +
       

     

       55
       55
       +
         };

     

       56
       56
       +
       

     

       57
       57
       +
       }

+1 -11

nixos/modules/config/fonts/fontconfig-ultimate.nix

···

       43
       43
        
               ultimate = {

     

       44
       44
        
                 enable = mkOption {

     

       45
       45
        
                   type = types.bool;

     

       46
       46
       -
                   default = true;

     

       46
       46
       +
                   default = false;

     

       47
       47
        
                   description = ''

     

       48
       48
        
                     Enable fontconfig-ultimate settings (formerly known as

     

       49
       49
        
                     Infinality). Besides the customizable settings in this NixOS

     
···

       63
       63
        
                     <literal>none</literal> disables the substitutions.

     

       64
       64
        
                   '';

     

       65
       65
        
                 };

     

       66
       66
       -
       

     

       67
       67
       -
                 preset = mkOption {

     

       68
       68
       -
                   type = types.enum ["ultimate1" "ultimate2" "ultimate3" "ultimate4" "ultimate5" "osx" "windowsxp"];

     

       69
       69
       -
                   default = "ultimate3";

     

       70
       70
       -
                   description = ''

     

       71
       71
       -
                     FreeType rendering settings preset. Any of the presets may be

     

       72
       72
       -
                     customized by setting environment variables.

     

       73
       73
       -
                   '';

     

       74
       74
       -
                 };

     

       75
       66
        
               };

     

       76
       67
        
             };

     

       77
       68
        
           };

     
···

       81
       72
        
         config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {

     

       82
       73
        
       

     

       83
       74
        
           fonts.fontconfig.confPackages = [ confPkg ];

     

       84
       84
       -
           environment.variables."INFINALITY_FT" = cfg.preset;

     

       85
       75
        
       

     

       86
       76
        
         };

     

       87
       77

+32 -23

nixos/modules/config/fonts/fontconfig.nix

···

       75
       75
        
             <fontconfig>

     

       76
       76
        
       

     

       77
       77
        
               <!-- Default rendering settings -->

     

       78
       78
       -
               <match target="font">

     

       79
       79
       -
                 <edit mode="assign" name="hinting">

     

       78
       78
       +
               <match target="pattern">

     

       79
       79
       +
                 <edit mode="append" name="hinting">

     

       80
       80
        
                   ${fcBool cfg.hinting.enable}

     

       81
       81
        
                 </edit>

     

       82
       82
       -
                 <edit mode="assign" name="autohint">

     

       82
       82
       +
                 <edit mode="append" name="autohint">

     

       83
       83
        
                   ${fcBool cfg.hinting.autohint}

     

       84
       84
        
                 </edit>

     

       85
       85
       -
                 <edit mode="assign" name="hintstyle">

     

       86
       86
       -
                   <const>hint${cfg.hinting.style}</const>

     

       85
       85
       +
                 <edit mode="append" name="hintstyle">

     

       86
       86
       +
                   <const>hintslight</const>

     

       87
       87
        
                 </edit>

     

       88
       88
       -
                 <edit mode="assign" name="antialias">

     

       88
       88
       +
                 <edit mode="append" name="antialias">

     

       89
       89
        
                   ${fcBool cfg.antialias}

     

       90
       90
        
                 </edit>

     

       91
       91
       -
                 <edit mode="assign" name="rgba">

     

       91
       91
       +
                 <edit mode="append" name="rgba">

     

       92
       92
        
                   <const>${cfg.subpixel.rgba}</const>

     

       93
       93
        
                 </edit>

     

       94
       94
       -
                 <edit mode="assign" name="lcdfilter">

     

       94
       94
       +
                 <edit mode="append" name="lcdfilter">

     

       95
       95
        
                   <const>lcd${cfg.subpixel.lcdfilter}</const>

     

       96
       96
        
                 </edit>

     

       97
       97
        
               </match>

     
···

       304
       304
        
               antialias = mkOption {

     

       305
       305
        
                 type = types.bool;

     

       306
       306
        
                 default = true;

     

       307
       307
       -
                 description = "Enable font antialiasing.";

     

       307
       307
       +
                 description = ''

     

       308
       308
       +
                   Enable font antialiasing. At high resolution (> 200 DPI),

     

       309
       309
       +
                   antialiasing has no visible effect; users of such displays may want

     

       310
       310
       +
                   to disable this option.

     

       311
       311
       +
                 '';

     

       308
       312
        
               };

     

       309
       313
        
       

     

       310
       314
        
               dpi = mkOption {

     
···

       320
       324
        
                 type = types.lines;

     

       321
       325
        
                 default = "";

     

       322
       326
        
                 description = ''

     

       323
       323
       -
                   System-wide customization file contents, has higher priority than 

     

       327
       327
       +
                   System-wide customization file contents, has higher priority than

     

       324
       328
        
                   <literal>defaultFonts</literal> settings.

     

       325
       329
        
                 '';

     

       326
       330
        
               };

     
···

       358
       362
        
                 enable = mkOption {

     

       359
       363
        
                   type = types.bool;

     

       360
       364
        
                   default = true;

     

       361
       361
       -
                   description = "Enable TrueType hinting.";

     

       365
       365
       +
                   description = ''

     

       366
       366
       +
                     Enable font hinting. Hinting aligns glyphs to pixel boundaries to

     

       367
       367
       +
                     improve rendering sharpness at low resolution. At high resolution

     

       368
       368
       +
                     (> 200 dpi) hinting will do nothing (at best); users of such

     

       369
       369
       +
                     displays may want to disable this option.

     

       370
       370
       +
                   '';

     

       362
       371
        
                 };

     

       363
       372
        
       

     

       364
       373
        
                 autohint = mkOption {

     
···

       370
       379
        
                     correctly-hinted fonts.

     

       371
       380
        
                   '';

     

       372
       381
        
                 };

     

       373
       373
       -
       

     

       374
       374
       -
                 style = mkOption {

     

       375
       375
       -
                   type = types.enum ["none" "slight" "medium" "full"];

     

       376
       376
       -
                   default = "full";

     

       377
       377
       -
                   description = ''

     

       378
       378
       -
                     TrueType hinting style, one of <literal>none</literal>,

     

       379
       379
       -
                     <literal>slight</literal>, <literal>medium</literal>, or

     

       380
       380
       -
                     <literal>full</literal>.

     

       381
       381
       -
                   '';

     

       382
       382
       -
                 };

     

       383
       382
        
               };

     

       384
       383
        
       

     

       385
       384
        
               includeUserConf = mkOption {

     
···

       398
       397
        
                   default = "rgb";

     

       399
       398
        
                   type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"];

     

       400
       399
        
                   description = ''

     

       401
       401
       -
                     Subpixel order.

     

       400
       400
       +
                     Subpixel order. The overwhelming majority of displays are

     

       401
       401
       +
                     <literal>rgb</literal> in their normal orientation. Select

     

       402
       402
       +
                     <literal>vrgb</literal> for mounting such a display 90 degrees

     

       403
       403
       +
                     clockwise from its normal orientation or <literal>vbgr</literal>

     

       404
       404
       +
                     for mounting 90 degrees counter-clockwise. Select

     

       405
       405
       +
                     <literal>bgr</literal> in the unlikely event of mounting 180

     

       406
       406
       +
                     degrees from the normal orientation. Reverse these directions in

     

       407
       407
       +
                     the improbable event that the display's native subpixel order is

     

       408
       408
       +
                     <literal>bgr</literal>.

     

       402
       409
        
                   '';

     

       403
       410
        
                 };

     

       404
       411
        
       

     
···

       406
       413
        
                   default = "default";

     

       407
       414
        
                   type = types.enum ["none" "default" "light" "legacy"];

     

       408
       415
        
                   description = ''

     

       409
       409
       -
                     FreeType LCD filter.

     

       416
       416
       +
                     FreeType LCD filter. At high resolution (> 200 DPI), LCD filtering

     

       417
       417
       +
                     has no visible effect; users of such displays may want to select

     

       418
       418
       +
                     <literal>none</literal>.

     

       410
       419
        
                   '';

     

       411
       420
        
                 };

     

       412
       421

+2 -1

nixos/modules/module-list.nix

···

       1
       1
        
       [

     

       2
       2
        
         ./config/debug-info.nix

     

       3
       3
        
         ./config/fonts/corefonts.nix

     

       4
       4
       +
         ./config/fonts/fontconfig.nix

     

       5
       5
       +
         ./config/fonts/fontconfig-penultimate.nix

     

       4
       6
        
         ./config/fonts/fontconfig-ultimate.nix

     

       5
       5
       -
         ./config/fonts/fontconfig.nix

     

       6
       7
        
         ./config/fonts/fontdir.nix

     

       7
       8
        
         ./config/fonts/fonts.nix

     

       8
       9
        
         ./config/fonts/ghostscript.nix

+1 -3

nixos/modules/rename.nix

···

       141
       141
        
           # Unity3D

     

       142
       142
        
           (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])

     

       143
       143
        
       

     

       144
       144
       -
           # fontconfig-ultimate

     

       145
       145
       -
           (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ])

     

       146
       146
       -
       

     

       147
       144
        
           # murmur

     

       148
       145
        
           (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])

     

       149
       146
        
       

     
···

       202
       199
        
             "See the 16.09 release notes for more information.")

     

       203
       200
        
           (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")

     

       204
       201
        
           (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")

     

       202
       202
       +
           (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")

     

       205
       203
        
           (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]

     

       206
       204
        
             "Set the option `services.xserver.displayManager.sddm.package' instead.")

     

       207
       205
        
         ];

+1 -1

nixos/modules/services/x11/display-managers/default.nix

···

       24
       24
        
           Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter}

     

       25
       25
        
           Xft.hinting: ${if fontconfig.hinting.enable then "1" else "0"}

     

       26
       26
        
           Xft.autohint: ${if fontconfig.hinting.autohint then "1" else "0"}

     

       27
       27
       -
           Xft.hintstyle: hint${fontconfig.hinting.style}

     

       27
       27
       +
           Xft.hintstyle: hintslight

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
        
         # file provided by services.xserver.displayManager.session.script

-1

pkgs/applications/version-management/git-and-tools/git/default.nix

···

       30
       30
        
           ./symlinks-in-bin.patch

     

       31
       31
        
           ./git-sh-i18n.patch

     

       32
       32
        
           ./ssh-path.patch

     

       33
       33
       -
           ./ssl-cert-file.patch

     

       34
       33
        
         ];

     

       35
       34
        
       

     

       36
       35
        
         postPatch = ''

-11

pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch

···

       1
       1
       -
       diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c

     

       2
       2
       -
       --- git-2.7.4-orig/http.c	2016-03-17 21:47:59.000000000 +0100

     

       3
       3
       -
       +++ git-2.7.4/http.c	2016-04-12 11:38:33.187070848 +0200

     

       4
       4
       -
       @@ -544,6 +544,7 @@

     

       5
       5
       -
        #if LIBCURL_VERSION_NUM >= 0x070908

     

       6
       6
       -
        	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");

     

       7
       7
       -
        #endif

     

       8
       8
       -
       +	set_from_env(&ssl_cainfo, "SSL_CERT_FILE");

     

       9
       9
       -
        	set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");

     

       10
       10
       -
        

     

       11
       11
       -
        	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");

+2 -1

pkgs/applications/version-management/mercurial/default.nix

···

       7
       7
        
         version = "3.9.2";

     

       8
       8
        
         name = "mercurial-${version}";

     

       9
       9
        
         inherit (python2Packages) docutils hg-git dulwich python;

     

       10
       10
       -
       in python2Packages.mkPythonDerivation {

     

       10
       10
       +
       in python2Packages.buildPythonApplication {

     

       11
       11
        
         inherit name;

     

       12
       12
       +
         format = "other";

     

       12
       13
        
       

     

       13
       14
        
         src = fetchurl {

     

       14
       15
        
           url = "https://mercurial-scm.org/release/${name}.tar.gz";

+26

pkgs/data/fonts/fontconfig-penultimate/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let version = "0.2.1"; in

     

       4
       4
       +
       stdenv.mkDerivation {

     

       5
       5
       +
         name = "fontconfig-penultimate-${version}";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "ttuegel";

     

       9
       9
       +
           repo = "fontconfig-penultimate";

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "14arpalmpn7ig2myxslk4jdg6lm0cnmwsxy7zl0j7yr417k1kprf";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         installPhase = ''

     

       15
       15
       +
           mkdir -p $out/etc/fonts/conf.d

     

       16
       16
       +
           cp *.conf $out/etc/fonts/conf.d

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with stdenv.lib; {

     

       20
       20
       +
           homepage = https://github.com/ttuegel/fontconfig-penultimate;

     

       21
       21
       +
           description = "Sensible defaults for Fontconfig";

     

       22
       22
       +
           license = licenses.asl20;

     

       23
       23
       +
           maintainers = [ maintainers.ttuegel ];

     

       24
       24
       +
           platforms = platforms.all;

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+15 -2

pkgs/development/compilers/llvm/3.7/libc++abi.nix

···

       1
       1
       -
       { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:

     

       1
       1
       +
       { stdenv, cmake, fetch, fetchpatch, libcxx, libunwind, llvm, version }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       3
       3
       +
       let

     

       4
       4
       +
         # Newer LLVMs (3.8 onwards) have changed how some basic C++ stuff works, which breaks builds of this older version

     

       5
       5
       +
         llvm38-and-above = fetchpatch {

     

       6
       6
       +
           url    = "https://trac.macports.org/raw-attachment/ticket/50304/0005-string-Fix-exception-declaration.patch";

     

       7
       7
       +
           sha256 = "1lm38n7s0l5dbl7kp4i49pvzxz1mcvlr2vgsnj47agnwhhm63jvr";

     

       8
       8
       +
         };

     

       9
       9
       +
       in stdenv.mkDerivation {

     

       4
       10
        
         name = "libc++abi-${version}";

     

       5
       11
        
       

     

       6
       12
        
         src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4";

     
···

       15
       21
        
         '' + stdenv.lib.optionalString stdenv.isDarwin ''

     

       16
       22
        
           export TRIPLE=x86_64-apple-darwin

     

       17
       23
        
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         # I can't use patches directly because this is actually a patch for libc++'s source, which we manually extract

     

       26
       26
       +
         # into the libc++abi build environment above.

     

       27
       27
       +
         prePatch = ''(

     

       28
       28
       +
           cd ../libcxx-*

     

       29
       29
       +
           patch -p1 < ${llvm38-and-above}

     

       30
       30
       +
         )'';

     

       18
       31
        
       

     

       19
       32
        
         installPhase = if stdenv.isDarwin

     

       20
       33
        
           then ''

+11

pkgs/development/compilers/llvm/3.9/clang/default.nix

···

       29
       29
        
             sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp

     

       30
       30
        
           '';

     

       31
       31
        
       

     

       32
       32
       +
           outputs = [ "out" "python" ];

     

       33
       33
       +
       

     

       32
       34
        
           # Clang expects to find LLVMgold in its own prefix

     

       33
       35
        
           # Clang expects to find sanitizer libraries in its own prefix

     

       34
       36
        
           postInstall = ''

     

       35
       37
        
             ln -sv ${llvm}/lib/LLVMgold.so $out/lib

     

       36
       38
        
             ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/

     

       37
       39
        
             ln -sv $out/bin/clang $out/bin/cpp

     

       40
       40
       +
       

     

       41
       41
       +
             mkdir -p $python/bin $python/share/clang/

     

       42
       42
       +
             mv $out/bin/{git-clang-format,scan-view} $python/bin

     

       43
       43
       +
             if [ -e $out/bin/set-xcode-analyzer ]; then

     

       44
       44
       +
               mv $out/bin/set-xcode-analyzer $python/bin

     

       45
       45
       +
             fi

     

       46
       46
       +
             mv $out/share/clang/*.py $python/share/clang

     

       47
       47
       +
       

     

       48
       48
       +
             rm $out/bin/c-index-test

     

       38
       49
        
           '';

     

       39
       50
        
       

     

       40
       51
        
           enableParallelBuilding = true;

+9 -7

pkgs/development/compilers/llvm/3.9/llvm.nix

···

       40
       40
        
         outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";

     

       41
       41
        
       

     

       42
       42
        
         buildInputs = [ perl groff cmake libxml2 python libffi ]

     

       43
       43
       -
           ++ stdenv.lib.optionals stdenv.isDarwin

     

       44
       44
       -
                [ libcxxabi darwin.cctools darwin.apple_sdk.libs.xpc ];

     

       43
       43
       +
           ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];

     

       45
       44
        
       

     

       46
       45
        
         propagatedBuildInputs = [ ncurses zlib ];

     

       47
       46
        
       

     
···

       53
       52
        
             sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf";

     

       54
       53
        
           }}

     

       55
       54
        
         ''

     

       56
       56
       -
         # hacky fix: New LLVM releases require a newer OS X SDK than

     

       57
       57
       -
         # 10.9. This is a temporary measure until nixpkgs darwin support is

     

       58
       58
       -
         # updated.

     

       55
       55
       +
         # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

     

       56
       56
       +
         # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

     

       57
       57
       +
         # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd

     

       58
       58
       +
         # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by

     

       59
       59
       +
         # a flag and turn the flag off during the stdenv build. I realize that this LLVM isn't used in the stdenv but I want to

     

       60
       60
       +
         # keep it consistent with 4.0. We really shouldn't be copying and pasting all this code around...

     

       59
       61
        
         + stdenv.lib.optionalString stdenv.isDarwin ''

     

       60
       60
       -
               sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc

     

       62
       62
       +
           substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \

     

       63
       63
       +
             --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'

     

       61
       64
        
         ''

     

       62
       65
        
         # Patch llvm-config to return correct library path based on --link-{shared,static}.

     

       63
       66
        
         + stdenv.lib.optionalString (enableSharedLibraries) ''

     
···

       85
       88
        
           ++ stdenv.lib.optionals (isDarwin) [

     

       86
       89
        
           "-DLLVM_ENABLE_LIBCXX=ON"

     

       87
       90
        
           "-DCAN_TARGET_i386=false"

     

       88
       88
       -
           "-DCMAKE_LIBTOOL=${darwin.cctools}/bin/libtool"

     

       89
       91
        
         ];

     

       90
       92
        
       

     

       91
       93
        
         postBuild = ''

-11

pkgs/development/libraries/cairo/default.nix

···

       19
       19
        
           sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         infinality = fetchFromGitHub {

     

       23
       23
       -
           owner = "bohoomil";

     

       24
       24
       -
           repo = "fontconfig-ultimate";

     

       25
       25
       -
           rev = "730f5e77580677e86522c1f2119aa78803741759";

     

       26
       26
       -
           sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7";

     

       27
       27
       -
         };

     

       28
       28
       -
       

     

       29
       22
        
         patches = [

     

       30
       23
        
           # from https://bugs.freedesktop.org/show_bug.cgi?id=98165

     

       31
       24
        
           (fetchpatch {

     
···

       34
       27
        
             sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri";

     

       35
       28
        
           })

     

       36
       29
        
         ];

     

       37
       37
       -
       

     

       38
       38
       -
         prePatch = ''

     

       39
       39
       -
           patches="$patches $(echo $infinality/*_cairo-iu/*.patch)"

     

       40
       40
       -
         '';

     

       41
       30
        
       

     

       42
       31
        
         outputs = [ "out" "dev" "devdoc" ];

     

       43
       32
        
         outputBin = "dev"; # very small

+5 -11

pkgs/development/libraries/fontconfig/2.10.nix

···

       8
       8
        
           sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         infinality_patch =

     

       12
       12
       -
           let subvers = "1";

     

       13
       13
       -
             in fetchurl {

     

       14
       14
       -
               url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;

     

       15
       15
       -
               sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";

     

       16
       16
       -
             }

     

       17
       17
       -
           ;

     

       11
       11
       +
         patches = [

     

       12
       12
       +
           # FreeType 2.7 prefixes PCF font family names with the foundry name.

     

       13
       13
       +
           # The output of fc-list and fc-query change which breaks the tests.

     

       14
       14
       +
           ./test-pcf-family-names-freetype-2.7.patch

     

       15
       15
       +
         ];

     

       18
       16
        
       

     

       19
       17
        
         outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config

     

       20
       18
        
       

     
···

       43
       41
        
       

     

       44
       42
        
         # Don't try to write to /var/cache/fontconfig at install time.

     

       45
       43
        
         installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";

     

       46
       46
       -
       

     

       47
       47
       -
         postInstall = ''

     

       48
       48
       -
           cd "$out/etc/fonts" && tar xvf ${infinality_patch}

     

       49
       49
       -
         '';

     

       50
       44
        
       

     

       51
       45
        
         passthru = {

     

       52
       46
        
           # Empty for backward compatibility, there was no versioning before 2.11

+4

pkgs/development/libraries/fontconfig/default.nix

···

       33
       33
        
             url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";

     

       34
       34
        
             sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";

     

       35
       35
        
           })

     

       36
       36
       +
       

     

       37
       37
       +
           # FreeType 2.7 prefixes PCF font family names with the foundry name.

     

       38
       38
       +
           # The output of fc-list and fc-query change which breaks the tests.

     

       39
       39
       +
           ./test-pcf-family-names-freetype-2.7.patch

     

       36
       40
        
         ];

     

       37
       41
        
         # additionally required for the glibc-2.25 patch; avoid requiring gperf

     

       38
       42
        
         postPatch = ''

+18

pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch

···

       1
       1
       +
       diff -Nuar fontconfig-2.10.2-orig/test/out.expected fontconfig-2.10.2/test/out.expected

     

       2
       2
       +
       --- fontconfig-2.10.2-orig/test/out.expected	2017-03-06 06:45:50.876053093 -0600

     

       3
       3
       +
       +++ fontconfig-2.10.2/test/out.expected	2017-03-06 06:48:18.012514337 -0600

     

       4
       4
       +
       @@ -1,8 +1,8 @@

     

       5
       5
       +
       -Fixed:pixelsize=16

     

       6
       6
       +
       -Fixed:pixelsize=6

     

       7
       7
       +
       +Misc Fixed:pixelsize=6

     

       8
       8
       +
       +Sony Fixed:pixelsize=16

     

       9
       9
       +
        =

     

       10
       10
       +
       -Fixed:pixelsize=16

     

       11
       11
       +
       -Fixed:pixelsize=6

     

       12
       12
       +
       +Misc Fixed:pixelsize=6

     

       13
       13
       +
       +Sony Fixed:pixelsize=16

     

       14
       14
       +
        =

     

       15
       15
       +
       -Fixed:pixelsize=16

     

       16
       16
       +
       -Fixed:pixelsize=6

     

       17
       17
       +
       +Misc Fixed:pixelsize=6

     

       18
       18
       +
       +Sony Fixed:pixelsize=16

+33 -59

pkgs/development/libraries/freetype/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchFromGitHub, pkgconfig, which, zlib, bzip2, libpng, gnumake

     

       2
       2
       -
       , glib /* passthru only */

     

       1
       1
       +
       {

     

       2
       2
       +
         stdenv, lib, fetchurl, copyPathsToStore,

     

       3
       3
       +
         pkgconfig, which,

     

       4
       4
       +
         zlib, bzip2, libpng, gnumake, glib,

     

       3
       5
        
       

     

       4
       4
       -
         # FreeType supports sub-pixel rendering.  This is patented by

     

       5
       5
       -
         # Microsoft, so it is disabled by default.  This option allows it to

     

       6
       6
       -
         # be enabled.  See http://www.freetype.org/patents.html.

     

       7
       7
       -
       , useEncumberedCode ? true

     

       8
       8
       -
       , useInfinality ? true

     

       6
       6
       +
         # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).

     

       7
       7
       +
         # LCD filtering is also known as ClearType and covered by several Microsoft patents.

     

       8
       8
       +
         # This option allows it to be disabled. See http://www.freetype.org/patents.html.

     

       9
       9
       +
         useEncumberedCode ? true,

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       11
       -
       assert useInfinality -> useEncumberedCode;

     

       12
       12
       +
       with { inherit (stdenv.lib) optional optionals optionalString; };

     

       12
       13
        
       

     

       13
       13
       -
       let

     

       14
       14
       -
         version = "2.6.5";

     

       14
       14
       +
       let version = "2.7.1"; name = "freetype-" + version; in

     

       15
       15
        
       

     

       16
       16
       -
         infinality = fetchFromGitHub {

     

       17
       17
       -
           owner = "archfan";

     

       18
       18
       -
           repo = "infinality_bundle";

     

       19
       19
       -
           rev = "5c0949a477bf43d2ac4e57b4fc39bcc3331002ee";

     

       20
       20
       -
           sha256 = "17389aqm6rlxl4b5mv1fx4b22x2v2n60hfhixfxqxpd8ialsdi6l";

     

       16
       16
       +
       stdenv.mkDerivation {

     

       17
       17
       +
         inherit name;

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with stdenv.lib; {

     

       20
       20
       +
           description = "A font rendering engine";

     

       21
       21
       +
           longDescription = ''

     

       22
       22
       +
             FreeType is a portable and efficient library for rendering fonts. It

     

       23
       23
       +
             supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR

     

       24
       24
       +
             fonts. It has a bytecode interpreter and has an automatic hinter called

     

       25
       25
       +
             autofit which can be used instead of hinting instructions included in

     

       26
       26
       +
             fonts.

     

       27
       27
       +
           '';

     

       28
       28
       +
           homepage = https://www.freetype.org/;

     

       29
       29
       +
           license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)

     

       30
       30
       +
           platforms = platforms.all;

     

       31
       31
       +
           maintainers = with maintainers; [ ttuegel ];

     

       21
       32
        
         };

     

       22
       22
       -
       

     

       23
       23
       -
       in

     

       24
       24
       -
       with { inherit (stdenv.lib) optional optionals optionalString; };

     

       25
       25
       -
       stdenv.mkDerivation rec {

     

       26
       26
       -
         name = "freetype-${version}";

     

       27
       33
        
       

     

       28
       34
        
         src = fetchurl {

     

       29
       35
        
           url = "mirror://savannah/freetype/${name}.tar.bz2";

     

       30
       30
       -
           sha256 = "1w5c87s4rpx9af5b3mk5cjd1yny3c4dq5p9iv3ixb3vr00a6w2p2";

     

       36
       36
       +
           sha256 = "121gm15ayfg3rglby8ifh8384mcjb9dhmx9j40zl7yszw72b4frs";

     

       31
       37
        
         };

     

       32
       38
        
       

     

       33
       33
       -
         patches = [

     

       34
       34
       -
           # Patch for validation of OpenType and GX/AAT tables.

     

       35
       35
       -
           (fetchurl {

     

       36
       36
       -
             name = "freetype-2.2.1-enable-valid.patch";

     

       37
       37
       -
             url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990";

     

       38
       38
       -
             sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l";

     

       39
       39
       -
           })

     

       40
       40
       -
         ] ++ optionals (!useInfinality && useEncumberedCode) [

     

       41
       41
       -
           # Patch to enable subpixel rendering.

     

       42
       42
       -
           # See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html.

     

       43
       43
       -
           (fetchurl {

     

       44
       44
       -
             name = "freetype-2.3.0-enable-spr.patch";

     

       45
       45
       -
             url = http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.3.0-enable-spr.patch?id=9a81147af83b1166a5f301e379f85927cc610990;

     

       46
       46
       -
             sha256 = "13ni9n5q3nla38wjmxd4f8cy29gp62kjx2l6y6nqhdyiqp8fz8nd";

     

       47
       47
       -
           })

     

       48
       48
       -
         ];

     

       49
       49
       -
       

     

       50
       50
       -
         prePatch = optionalString useInfinality ''

     

       51
       51
       -
           patches="$patches $(ls ${infinality}/*_freetype2-iu/*-infinality-*.patch)"

     

       52
       52
       -
         '';

     

       53
       53
       -
       

     

       54
       54
       -
         outputs = [ "out" "dev" ];

     

       55
       55
       -
       

     

       56
       39
        
         propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype

     

       57
       40
        
         # dependence on harfbuzz is looser than the reverse dependence

     

       58
       41
        
         nativeBuildInputs = [ pkgconfig which ]

     

       59
       42
        
           # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.

     

       60
       43
        
           ++ optional (!stdenv.isLinux) gnumake;

     

       44
       44
       +
       

     

       45
       45
       +
         patches =

     

       46
       46
       +
           [ ./enable-table-validation.patch ]

     

       47
       47
       +
           ++ optional useEncumberedCode ./enable-subpixel-rendering.patch;

     

       48
       48
       +
       

     

       49
       49
       +
         outputs = [ "out" "dev" ];

     

       61
       50
        
       

     

       62
       51
        
         configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];

     

       63
       52
        
       

     
···

       75
       64
        
           # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't

     

       76
       65
        
           # know why it's on the PATH.

     

       77
       66
        
           configureFlags = "--disable-static CC_BUILD=gcc";

     

       78
       78
       -
         };

     

       79
       79
       -
       

     

       80
       80
       -
         meta = with stdenv.lib; {

     

       81
       81
       -
           description = "A font rendering engine";

     

       82
       82
       -
           longDescription = ''

     

       83
       83
       -
             FreeType is a portable and efficient library for rendering fonts. It

     

       84
       84
       -
             supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR

     

       85
       85
       -
             fonts. It has a bytecode interpreter and has an automatic hinter called

     

       86
       86
       -
             autofit which can be used instead of hinting instructions included in

     

       87
       87
       -
             fonts.

     

       88
       88
       -
           '';

     

       89
       89
       -
           homepage = https://www.freetype.org/;

     

       90
       90
       -
           license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)

     

       91
       91
       -
           #ToDo: encumbered = useEncumberedCode;

     

       92
       92
       -
           platforms = platforms.all;

     

       93
       67
        
         };

     

       94
       68
        
       }

+13

pkgs/development/libraries/freetype/enable-subpixel-rendering.patch

···

       1
       1
       +
       Index: freetype-2.7.1/include/freetype/config/ftoption.h

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- freetype-2.7.1.orig/include/freetype/config/ftoption.h

     

       4
       4
       +
       +++ freetype-2.7.1/include/freetype/config/ftoption.h

     

       5
       5
       +
       @@ -122,7 +122,7 @@ FT_BEGIN_HEADER

     

       6
       6
       +
          /* This is done to allow FreeType clients to run unmodified, forcing     */

     

       7
       7
       +
          /* them to display normal gray-level anti-aliased glyphs.                */

     

       8
       8
       +
          /*                                                                       */

     

       9
       9
       +
       -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */

     

       10
       10
       +
       +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING

     

       11
       11
       +
        

     

       12
       12
       +
        

     

       13
       13
       +
          /*************************************************************************/

+22

pkgs/development/libraries/freetype/enable-table-validation.patch

···

       1
       1
       +
       Index: freetype-2.7.1/modules.cfg

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- freetype-2.7.1.orig/modules.cfg

     

       4
       4
       +
       +++ freetype-2.7.1/modules.cfg

     

       5
       5
       +
       @@ -120,7 +120,7 @@ AUX_MODULES += cache

     

       6
       6
       +
        # TrueType GX/AAT table validation.  Needs ftgxval.c below.

     

       7
       7
       +
        #

     

       8
       8
       +
        # No FT_CONFIG_OPTION_PIC support.

     

       9
       9
       +
       -# AUX_MODULES += gxvalid

     

       10
       10
       +
       +AUX_MODULES += gxvalid

     

       11
       11
       +
        

     

       12
       12
       +
        # Support for streams compressed with gzip (files with suffix .gz).

     

       13
       13
       +
        #

     

       14
       14
       +
       @@ -143,7 +143,7 @@ AUX_MODULES += bzip2

     

       15
       15
       +
        # OpenType table validation.  Needs ftotval.c below.

     

       16
       16
       +
        #

     

       17
       17
       +
        # No FT_CONFIG_OPTION_PIC support.

     

       18
       18
       +
       -# AUX_MODULES += otvalid

     

       19
       19
       +
       +AUX_MODULES += otvalid

     

       20
       20
       +
        

     

       21
       21
       +
        # Auxiliary PostScript driver component to share common code.

     

       22
       22
       +
        #

+5 -2

pkgs/development/libraries/jemalloc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "jemalloc-${version}";

     

       5
       5
       -
         version = "4.3.1";

     

       5
       5
       +
         version = "4.5.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "12r71i8nm3vwz21fc16rwbb0pwcg5s05n1qg3rwl2s85v0x1ifzp";

     

       9
       9
       +
           sha256 = "9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which

     

       13
       13
        
         # then stops downstream builds (mariadb in particular) from detecting it. This

     

       14
       14
        
         # option should remove the prefix and give us a working jemalloc.

     

       15
       15
        
         configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";

     

       16
       16
       +
       

     

       17
       17
       +
         doCheck = true;

     

       18
       18
       +
       

     

       16
       19
        
       

     

       17
       20
        
         meta = with stdenv.lib; {

     

       18
       21
        
           homepage = http://jemalloc.net;

+5 -3

pkgs/development/libraries/mesa/default.nix

···

       5
       5
        
       , libelf, libvdpau, python2

     

       6
       6
        
       , grsecEnabled ? false

     

       7
       7
        
       , enableRadv ? false

     

       8
       8
       -
       , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt

     

       8
       8
       +
       # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.

     

       9
       9
       +
       # It's overridden for mesa_drivers.

     

       10
       10
       +
       , enableTextureFloats ? false

     

       9
       11
        
       , galliumDrivers ? null

     

       10
       12
        
       , driDrivers ? null

     

       11
       13
        
       , vulkanDrivers ? null

     
···

       63
       65
        
       in

     

       64
       66
        
       

     

       65
       67
        
       let

     

       66
       66
       -
         version = "17.0.1";

     

       68
       68
       +
         version = "17.0.2";

     

       67
       69
        
         branch  = head (splitString "." version);

     

       68
       70
        
         driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";

     

       69
       71
        
       in

     
···

       78
       80
        
             "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"

     

       79
       81
        
             "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"

     

       80
       82
        
           ];

     

       81
       81
       -
           sha256 = "96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c";

     

       83
       83
       +
           sha256 = "f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4";

     

       82
       84
        
         };

     

       83
       85
        
       

     

       84
       86
        
         prePatch = "patchShebangs .";

+11 -5

pkgs/development/libraries/nghttp2/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig

     

       2
       2
        
       

     

       3
       3
        
       # Optional Dependencies

     

       4
       4
       -
       , openssl ? null, libev ? null, zlib ? null, libcares ? null

     

       4
       4
       +
       , openssl ? null, libev ? null, zlib ? null, c-ares ? null

     

       5
       5
        
       , enableHpack ? false, jansson ? null

     

       6
       6
        
       , enableAsioLib ? false, boost ? null

     

       7
       7
        
       , enableGetAssets ? false, libxml2 ? null

     
···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
        
         name = "nghttp2-${version}";

     

       20
       20
       -
         version = "1.19.0";

     

       20
       20
       +
         version = "1.20.0";

     

       21
       21
        
       

     

       22
       22
        
         # Don't use fetchFromGitHub since this needs a bootstrap curl

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";

     

       25
       25
       -
           sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a";

     

       25
       25
       +
           sha256 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         outputs = [ "out" "dev" "lib" ];

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [ pkgconfig ];

     

       31
       31
       -
         buildInputs = [ openssl libev zlib libcares ]

     

       31
       31
       +
         buildInputs = [ openssl libev zlib c-ares ]

     

       32
       32
        
           ++ optional enableHpack jansson

     

       33
       33
        
           ++ optional enableAsioLib boost

     

       34
       34
        
           ++ optional enableGetAssets libxml2

     
···

       36
       36
        
       

     

       37
       37
        
         enableParallelBuilding = true;

     

       38
       38
        
       

     

       39
       39
       +
         configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ]

     

       40
       40
       +
           ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib";

     

       41
       41
       +
       

     

       42
       42
       +
         #doCheck = true;  # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc

     

       43
       43
       +
       

     

       44
       44
       +
       

     

       39
       45
        
         meta = with stdenv.lib; {

     

       40
       40
       -
           homepage = http://nghttp2.org/;

     

       46
       46
       +
           homepage = https://nghttp2.org/;

     

       41
       47
        
           description = "A C implementation of HTTP/2";

     

       42
       48
        
           license = licenses.mit;

     

       43
       49
        
           platforms = platforms.all;

+3 -1

pkgs/development/libraries/openssl/default.nix

···

       19
       19
        
       

     

       20
       20
        
           patches =

     

       21
       21
        
             (args.patches or [])

     

       22
       22
       -
             ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch

     

       22
       22
       +
             ++ [ ./nix-ssl-cert-file.patch ]

     

       23
       23
       +
             ++ optional (versionOlder version "1.1.0")

     

       24
       24
       +
                 (if stdenv.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch)

     

       23
       25
        
             ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch

     

       24
       26
        
             ++ optional

     

       25
       27
        
                  (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")))

+14

pkgs/development/libraries/openssl/nix-ssl-cert-file.patch

···

       1
       1
       +
       diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c

     

       2
       2
       +
       --- openssl-1.0.2j-orig/crypto/x509/by_file.c	2016-09-26 11:49:07.000000000 +0200

     

       3
       3
       +
       +++ openssl-1.0.2j/crypto/x509/by_file.c	2016-10-13 16:54:31.400288302 +0200

     

       4
       4
       +
       @@ -97,7 +97,9 @@

     

       5
       5
       +
            switch (cmd) {

     

       6
       6
       +
            case X509_L_FILE_LOAD:

     

       7
       7
       +
                if (argl == X509_FILETYPE_DEFAULT) {

     

       8
       8
       +
       -            file = (char *)getenv(X509_get_default_cert_file_env());

     

       9
       9
       +
       +            file = (char *)getenv("NIX_SSL_CERT_FILE");

     

       10
       10
       +
       +            if (!file)

     

       11
       11
       +
       +                file = (char *)getenv(X509_get_default_cert_file_env());

     

       12
       12
       +
                    if (file)

     

       13
       13
       +
                        ok = (X509_load_cert_crl_file(ctx, file,

     

       14
       14
       +
                                                      X509_FILETYPE_PEM) != 0);

+13

pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch

···

       1
       1
       +
       diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h

     

       2
       2
       +
       --- openssl-1.0.1r-orig/crypto/cryptlib.h	2016-01-28 14:38:30.000000000 +0100

     

       3
       3
       +
       +++ openssl-1.0.1r/crypto/cryptlib.h	2016-02-03 12:54:29.193165176 +0100

     

       4
       4
       +
       @@ -81,8 +81,8 @@

     

       5
       5
       +
        

     

       6
       6
       +
        # ifndef OPENSSL_SYS_VMS

     

       7
       7
       +
        #  define X509_CERT_AREA          OPENSSLDIR

     

       8
       8
       +
        #  define X509_CERT_DIR           OPENSSLDIR "/certs"

     

       9
       9
       +
       -#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"

     

       10
       10
       +
       +#  define X509_CERT_FILE          "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"

     

       11
       11
       +
        #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"

     

       12
       12
       +
        # else

     

       13
       13
       +
        #  define X509_CERT_AREA          "SSLROOT:[000000]"

+3 -2

pkgs/development/python-modules/dbus/default.nix

···

       1
       1
       -
       { lib, fetchurl, mkPythonDerivation, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy

     

       1
       1
       +
       { lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy

     

       2
       2
        
       , ncurses, pygobject3 }:

     

       3
       3
        
       

     

       4
       4
       -
       if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else mkPythonDerivation rec {

     

       4
       4
       +
       if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {

     

       5
       5
        
         name = "dbus-python-1.2.4";

     

       6
       6
       +
         format = "other";

     

       6
       7
        
       

     

       7
       8
        
         src = fetchurl {

     

       8
       9
        
           url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";

+3 -2

pkgs/development/python-modules/koji/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, mkPythonDerivation, pycurl }:

     

       1
       1
       +
       { stdenv, fetchurl, buildPythonPackage, pycurl }:

     

       2
       2
        
       

     

       3
       3
       -
       mkPythonDerivation rec {

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
        
         name = "koji-1.8";

     

       5
       5
       +
         format = "other";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       8
        
           url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";

+3 -2

pkgs/development/python-modules/libsexy/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, mkPythonDerivation, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:

     

       1
       1
       +
       { stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:

     

       2
       2
        
       

     

       3
       3
       -
       mkPythonDerivation rec {

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
        
         name = "libsexy-${version}";

     

       5
       5
        
         version = "0.1.9";

     

       6
       6
       +
         format = "other";

     

       6
       7
        
       

     

       7
       8
        
         src = fetchurl {

     

       8
       9
        
           url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz";

+3 -2

pkgs/development/python-modules/pycairo/default.nix

···

       1
       1
       -
       { lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }:

     

       1
       1
       +
       { lib, fetchurl, fetchpatch, python, buildPythonPackage, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }:

     

       2
       2
        
       

     

       3
       3
       -
       if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec {

     

       3
       3
       +
       if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else buildPythonPackage rec {

     

       4
       4
        
         version = "1.10.0";

     

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

     

       6
       6
       +
         format = "other";

     

       6
       7
        
         src = if isPy3k

     

       7
       8
        
           then fetchurl {

     

       8
       9
        
             url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";

+3 -2

pkgs/development/python-modules/pygobject/3.nix

···

       1
       1
       -
       { stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:

     

       1
       1
       +
       { stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:

     

       2
       2
        
       

     

       3
       3
       -
       mkPythonDerivation rec {

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
        
         major = "3.22";

     

       5
       5
        
         minor = "0";

     

       6
       6
        
         name = "pygobject-${major}.${minor}";

     

       7
       7
       +
         format = "other";

     

       7
       8
        
       

     

       8
       9
        
         src = fetchurl {

     

       9
       10
        
           url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";

+3 -2

pkgs/development/python-modules/pygobject/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, python, mkPythonDerivation, pkgconfig, glib }:

     

       1
       1
       +
       { stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }:

     

       2
       2
        
       

     

       3
       3
       -
       mkPythonDerivation rec {

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
        
         name = "pygobject-${version}";

     

       5
       5
        
         version = "2.28.6";

     

       6
       6
       +
         format = "other";

     

       6
       7
        
       

     

       7
       8
        
         src = fetchurl {

     

       8
       9
        
           url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";

+3 -2

pkgs/development/python-modules/pygtksourceview/default.nix

···

       1
       1
       -
       { lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }:

     

       1
       1
       +
       { lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }:

     

       2
       2
        
       

     

       3
       3
        
       let version = "2.10.1"; in

     

       4
       4
        
       

     

       5
       5
       -
       mkPythonDerivation {

     

       5
       5
       +
       buildPythonPackage {

     

       6
       6
        
         name = "pygtksourceview-${version}";

     

       7
       7
       +
         format = "other";

     

       7
       8
        
       

     

       8
       9
        
         src = fetchurl {

     

       9
       10
        
           url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";

+3 -2

pkgs/development/python-modules/pyqt/4.x.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "4.12";

     

       5
       5
       -
         inherit (pythonPackages) mkPythonDerivation python dbus-python sip;

     

       6
       6
       -
       in mkPythonDerivation {

     

       5
       5
       +
         inherit (pythonPackages) buildPythonPackage python dbus-python sip;

     

       6
       6
       +
       in buildPythonPackage {

     

       7
       7
        
         name = "PyQt-x11-gpl-${version}";

     

       8
       8
       +
         format = "other";

     

       8
       9
        
       

     

       9
       10
        
         src = fetchurl {

     

       10
       11
        
           url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz";

+3 -2

pkgs/development/python-modules/pyqt/5.x.nix

···

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         version = "5.8.1";

     

       6
       6
       -
         inherit (pythonPackages) mkPythonDerivation python dbus-python sip;

     

       7
       7
       -
       in mkPythonDerivation {

     

       6
       6
       +
         inherit (pythonPackages) buildPythonPackage python dbus-python sip;

     

       7
       7
       +
       in buildPythonPackage {

     

       8
       8
        
         name = "PyQt-${version}";

     

       9
       9
       +
         format = "other";

     

       9
       10
        
       

     

       10
       11
        
         meta = with lib; {

     

       11
       12
        
           description = "Python bindings for Qt5";

+3 -2

pkgs/development/python-modules/pyside/default.nix

···

       1
       1
       -
       { lib, fetchurl, cmake, python, mkPythonDerivation, pysideGeneratorrunner, pysideShiboken, qt4 }:

     

       1
       1
       +
       { lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:

     

       2
       2
        
       

     

       3
       3
       -
       mkPythonDerivation rec {

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
        
         name = "pyside-${version}";

     

       5
       5
        
         version = "1.2.4";

     

       6
       6
       +
         format = "other";

     

       6
       7
        
       

     

       7
       8
        
         src = fetchurl {

     

       8
       9
        
           url = "https://github.com/PySide/PySide/archive/${version}.tar.gz";

+3 -2

pkgs/development/python-modules/pyxml/default.nix

···

       1
       1
       -
       {lib, fetchurl, python, mkPythonDerivation, makeWrapper}:

     

       1
       1
       +
       {lib, fetchurl, python, buildPythonPackage, makeWrapper}:

     

       2
       2
        
       

     

       3
       3
       -
       mkPythonDerivation rec {

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
        
         name = "PyXML-0.8.4";

     

       5
       5
       +
         format = "other";

     

       5
       6
        
         src = fetchurl {

     

       6
       7
        
           url = "mirror://sourceforge/pyxml/${name}.tar.gz";

     

       7
       8
        
           sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";

+3 -2

pkgs/development/python-modules/sip/default.nix

···

       1
       1
       -
       { lib, fetchurl, mkPythonDerivation, python, isPyPy }:

     

       1
       1
       +
       { lib, fetchurl, buildPythonPackage, python, isPyPy }:

     

       2
       2
        
       

     

       3
       3
       -
       if isPyPy then throw "sip not supported for interpreter ${python.executable}" else mkPythonDerivation rec {

     

       3
       3
       +
       if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {

     

       4
       4
        
         name = "sip-4.19.1";

     

       5
       5
       +
         format = "other";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       8
        
           url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";

+2 -1

pkgs/development/tools/documentation/gnome-doc-utils/default.nix

···

       1
       1
        
       {stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool

     

       2
       2
        
       , makeWrapper, python2Packages }:

     

       3
       3
        
       

     

       4
       4
       -
       python2Packages.mkPythonDerivation {

     

       4
       4
       +
       python2Packages.buildPythonApplication {

     

       5
       5
        
         name = "gnome-doc-utils-0.20.10";

     

       6
       6
       +
         format = "other";

     

       6
       7
        
       

     

       7
       8
        
         src = fetchurl {

     

       8
       9
        
           url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz;

+3 -3

pkgs/development/tools/misc/autogen/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "autogen-${version}";

     

       5
       5
       -
         version = "5.18.7";

     

       5
       5
       +
         version = "5.18.12";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://gnu/autogen/autogen-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7";

     

       8
       8
       +
           url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz";

     

       9
       9
       +
           sha256 = "1n5zq4872sakvz9c7ncsdcfp0z8rsybsxvbmhkpbd19ii0pacfxy";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         outputs = [ "bin" "dev" "lib" "out" "man" "info" ];

+2 -2

pkgs/development/tools/misc/d-feet/default.nix

···

       4
       4
        
       let

     

       5
       5
        
         version = "${major}.11";

     

       6
       6
        
         major = "0.3";

     

       7
       7
       -
       in pythonPackages.mkPythonDerivation rec {

     

       7
       7
       +
       in pythonPackages.buildPythonApplication rec {

     

       8
       8
        
         name = "d-feet-${version}";

     

       9
       9
       -
         namePrefix = "";

     

       9
       9
       +
         format = "other";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";

+2 -1

pkgs/misc/drivers/hplip/default.nix

···

       47
       47
        
       assert withPlugin -> builtins.elem hplipArch pluginArches

     

       48
       48
        
         || throw "HPLIP plugin not supported on ${stdenv.system}";

     

       49
       49
        
       

     

       50
       50
       -
       pythonPackages.mkPythonDerivation {

     

       50
       50
       +
       pythonPackages.buildPythonApplication {

     

       51
       51
        
         inherit name src;

     

       52
       52
       +
         format = "other";

     

       52
       53
        
       

     

       53
       54
        
         buildInputs = [

     

       54
       55
        
           libjpeg

+2 -1

pkgs/os-specific/linux/dstat/default.nix

···

       1
       1
        
       { stdenv, fetchurl, python2Packages }:

     

       2
       2
        
       

     

       3
       3
       -
       python2Packages.mkPythonDerivation rec {

     

       3
       3
       +
       python2Packages.buildPythonApplication rec {

     

       4
       4
        
         name = "dstat-${version}";

     

       5
       5
       +
         format = "other";

     

       5
       6
        
         version = "0.7.3";

     

       6
       7
        
       

     

       7
       8
        
         src = fetchurl {

-7

pkgs/shells/bash/4.4.nix

···

       52
       52
        
         patchFlags = "-p0";

     

       53
       53
        
       

     

       54
       54
        
         patches = upstreamPatches

     

       55
       55
       -
             ++ [ (fetchurl {

     

       56
       56
       -
                     # https://security.gentoo.org/glsa/201701-02

     

       57
       57
       -
                     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells"

     

       58
       58
       -
                         + "/bash/files/bash-4.4-popd-offset-overflow.patch"

     

       59
       59
       -
                         + "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682";

     

       60
       60
       -
                     sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm";

     

       61
       61
       -
                 }) ]

     

       62
       55
        
             ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;

     

       63
       56
        
       

     

       64
       57
        
         crossAttrs = {

+7

pkgs/shells/bash/bash-4.4-patches.nix

···

       6
       6
        
       (patch "003" "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi")

     

       7
       7
        
       (patch "004" "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d")

     

       8
       8
        
       (patch "005" "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2")

     

       9
       9
       +
       (patch "006" "1f24wgqngmj2mrj9yibwvc2zvlmn5xi53mnw777g3l40c4m2x3ka")

     

       10
       10
       +
       (patch "007" "1bzdsnqaf05gdbqpsixhan8vygjxpcxlz1dd8d9f5jdznw3wq76y")

     

       11
       11
       +
       (patch "008" "1firw915mjm03hbbw9a70ch3cpgrgnvqjpllgdnn6csr8q04f546")

     

       12
       12
       +
       (patch "009" "0g1l56kvw61rpw7dqa9fcl9llkl693h73g631hrhxlm030ddssqb")

     

       13
       13
       +
       (patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4")

     

       14
       14
       +
       (patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx")

     

       15
       15
       +
       (patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps")

     

       9
       16
        
       ]

+1 -5

pkgs/tools/networking/curl/default.nix

···

       28
       28
        
           sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
       -
         patches = [ ];

     

       32
       32
       -
       

     

       33
       31
        
         outputs = [ "bin" "dev" "out" "man" "devdoc" ];

     

       34
       32
        
       

     

       35
       33
        
         enableParallelBuilding = true;

     
···

       57
       55
        
         '';

     

       58
       56
        
       

     

       59
       57
        
         configureFlags = [

     

       60
       60
       -
             # OS X does not have a default system bundle, so we assume cacerts is installed in the default nix-env profile

     

       61
       61
       -
             # This sucks. We should probably just include the latest cacerts in the darwin bootstrap.

     

       62
       62
       -
             "--with-ca-bundle=${if stdenv.isDarwin then "/nix/var/nix/profiles/default" else ""}/etc/ssl/certs/ca-${if stdenv.isDarwin then "bundle" else "certificates"}.crt"

     

       58
       58
       +
             "--with-ca-fallback"

     

       63
       59
        
             "--disable-manual"

     

       64
       60
        
             ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" )

     

       65
       61
        
             ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" )

+3

pkgs/top-level/all-packages.nix

···

       7442
       7442
        
       

     

       7443
       7443
        
         fontconfig = callPackage ../development/libraries/fontconfig { };

     

       7444
       7444
        
       

     

       7445
       7445
       +
         fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {};

     

       7446
       7446
       +
       

     

       7445
       7447
        
         fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {};

     

       7446
       7448
        
       

     

       7447
       7449
        
         folly = callPackage ../development/libraries/folly { };

     
···

       9011
       9013
        
         mesa_drivers = mesaDarwinOr (

     

       9012
       9014
        
           let mo = mesa_noglu.override {

     

       9013
       9015
        
             grsecEnabled = config.grsecurity or false;

     

       9016
       9016
       +
             enableTextureFloats = true;

     

       9014
       9017
        
           };

     

       9015
       9018
        
           in mo.drivers

     

       9016
       9019
        
         );

+10 -5

pkgs/top-level/python-packages.nix

···

       7035
       7035
        
           buildInputs = with self; [ fudge_9 nose ];

     

       7036
       7036
        
         };

     

       7037
       7037
        
       

     

       7038
       7038
       -
         fedora_cert = mkPythonDerivation rec {

     

       7038
       7038
       +
         fedora_cert = buildPythonPackage rec {

     

       7039
       7039
        
           name = "fedora-cert-0.5.9.2";

     

       7040
       7040
        
           meta.maintainers = with maintainers; [ mornfall ];

     

       7041
       7041
       +
           format = "other";

     

       7041
       7042
        
       

     

       7042
       7043
        
           src = pkgs.fetchurl {

     

       7043
       7044
        
             url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2";

     
···

       21810
       21811
        
         };

     

       21811
       21812
        
       

     

       21812
       21813
        
       

     

       21813
       21813
       -
         pysvn = mkPythonDerivation rec {

     

       21814
       21814
       +
         pysvn = buildPythonPackage rec {

     

       21814
       21815
        
           name = "pysvn-1.8.0";

     

       21816
       21816
       +
           format = "other";

     

       21815
       21817
        
       

     

       21816
       21818
        
           src = pkgs.fetchurl {

     

       21817
       21819
        
             url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz";

     
···

       21966
       21968
        
         });

     

       21967
       21969
        
       

     

       21968
       21970
        
       

     

       21969
       21969
       -
         pywebkitgtk = mkPythonDerivation rec {

     

       21971
       21971
       +
         pywebkitgtk = buildPythonPackage rec {

     

       21970
       21972
        
           name = "pywebkitgtk-${version}";

     

       21971
       21973
        
           version = "1.1.8";

     

       21974
       21974
       +
           format = "other";

     

       21972
       21975
        
       

     

       21973
       21976
        
           src = pkgs.fetchurl {

     

       21974
       21977
        
             url = "http://pywebkitgtk.googlecode.com/files/${name}.tar.bz2";

     
···

       22301
       22304
        
       

     

       22302
       22305
        
         qscintilla = if isPy3k || isPyPy

     

       22303
       22306
        
           then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"

     

       22304
       22304
       -
           else mkPythonDerivation rec {

     

       22307
       22307
       +
           else buildPythonPackage rec {

     

       22305
       22308
        
             # TODO: Qt5 support

     

       22306
       22309
        
             name = "qscintilla-${version}";

     

       22307
       22310
        
             version = pkgs.qscintilla.version;

     

       22311
       22311
       +
             format = "other";

     

       22308
       22312
        
       

     

       22309
       22313
        
             src = pkgs.qscintilla.src;

     

       22310
       22314
        
       

     
···

       25853
       25857
        
         # Python package.

     

       25854
       25858
        
         tkinter = let

     

       25855
       25859
        
           py = python.override{x11Support=true;};

     

       25856
       25856
       -
         in mkPythonDerivation rec {

     

       25860
       25860
       +
         in buildPythonPackage rec {

     

       25857
       25861
        
           name = "tkinter-${python.version}";

     

       25858
       25862
        
           src = py;

     

       25863
       25863
       +
           format = "other";

     

       25859
       25864
        
       

     

       25860
       25865
        
           disabled = isPy26 || isPyPy;

     

       25861
       25866