commit b5aaaf87a7741f1c20672c584ca08a01fa1a1129 · pyrox.dev/nixpkgs

+2 -1

lib/systems/default.nix

···

       26
       26
        
             libc =

     

       27
       27
        
               /**/ if final.isDarwin then "libSystem"

     

       28
       28
        
               else if final.isMinGW  then "msvcrt"

     

       29
       29
       -
               else if final.isLinux  then "glibc"

     

       29
       29
       +
               else if final.isMusl  then "musl"

     

       30
       30
       +
               else if final.isLinux /* default */    then "glibc"

     

       30
       31
        
               # TODO(@Ericson2314) think more about other operating systems

     

       31
       32
        
               else                        "native/impure";

     

       32
       33
        
             extensions = {

+11 -6

lib/systems/examples.nix

···

       13
       13
        
           config = "armv5tel-unknown-linux-gnueabi";

     

       14
       14
        
           arch = "armv5tel";

     

       15
       15
        
           float = "soft";

     

       16
       16
       -
           libc = "glibc";

     

       17
       16
        
           platform = platforms.sheevaplug;

     

       18
       17
        
         };

     

       19
       18
        
       

     
···

       22
       21
        
           arch = "armv6l";

     

       23
       22
        
           float = "hard";

     

       24
       23
        
           fpu = "vfp";

     

       25
       25
       -
           libc = "glibc";

     

       26
       24
        
           platform = platforms.raspberrypi;

     

       27
       25
        
         };

     

       28
       26
        
       

     
···

       31
       29
        
           arch = "armv7-a";

     

       32
       30
        
           float = "hard";

     

       33
       31
        
           fpu = "vfpv3-d16";

     

       34
       34
       -
           libc = "glibc";

     

       35
       32
        
           platform = platforms.armv7l-hf-multiplatform;

     

       36
       33
        
         };

     

       37
       34
        
       

     

       38
       35
        
         aarch64-multiplatform = rec {

     

       39
       36
        
           config = "aarch64-unknown-linux-gnu";

     

       40
       37
        
           arch = "aarch64";

     

       41
       41
       -
           libc = "glibc";

     

       42
       38
        
           platform = platforms.aarch64-multiplatform;

     

       43
       39
        
         };

     

       44
       40
        
       

     
···

       51
       47
        
           arch = "armv5tel";

     

       52
       48
        
           config = "armv5tel-unknown-linux-gnueabi";

     

       53
       49
        
           float = "soft";

     

       54
       54
       -
           libc = "glibc";

     

       55
       50
        
           platform = platforms.pogoplug4;

     

       56
       51
        
         };

     

       57
       52
        
       

     
···

       59
       54
        
           config = "mips64el-unknown-linux-gnu";

     

       60
       55
        
           arch = "mips";

     

       61
       56
        
           float = "hard";

     

       62
       62
       -
           libc = "glibc";

     

       63
       57
        
           platform = platforms.fuloong2f_n32;

     

       64
       58
        
         };

     

       59
       59
       +
       

     

       60
       60
       +
         muslpi = raspberryPi // {

     

       61
       61
       +
           config = "armv6l-unknown-linux-musleabihf";

     

       62
       62
       +
         };

     

       63
       63
       +
       

     

       64
       64
       +
         aarch64-multiplatform-musl = aarch64-multiplatform // {

     

       65
       65
       +
           config = "aarch64-unknown-linux-musl";

     

       66
       66
       +
         };

     

       67
       67
       +
       

     

       68
       68
       +
         musl64 = { config = "x86_64-unknown-linux-musl"; };

     

       69
       69
       +
         musl32  = { config = "i686-unknown-linux-musl"; };

     

       65
       70
        
       

     

       66
       71
        
         #

     

       67
       72
        
         # Darwin

+2

lib/systems/inspect.nix

···

       33
       33
        
           Windows      = { kernel = kernels.windows; };

     

       34
       34
        
           Cygwin       = { kernel = kernels.windows; abi = abis.cygnus; };

     

       35
       35
        
           MinGW        = { kernel = kernels.windows; abi = abis.gnu; };

     

       36
       36
       +
       

     

       37
       37
       +
           Musl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];

     

       36
       38
        
         };

     

       37
       39
        
       

     

       38
       40
        
         matchAnyAttrs = patterns:

+3

lib/systems/parse.nix

···

       180
       180
        
           androideabi = {};

     

       181
       181
        
           gnueabi = {};

     

       182
       182
        
           gnueabihf = {};

     

       183
       183
       +
           musleabi = {};

     

       184
       184
       +
           musleabihf = {};

     

       185
       185
       +
           musl = {};

     

       183
       186
        
       

     

       184
       187
        
           unknown = {};

     

       185
       188
        
         };

-9

lib/systems/platforms.nix

···

       2
       2
        
       rec {

     

       3
       3
        
         pcBase = {

     

       4
       4
        
           name = "pc";

     

       5
       5
       -
           kernelHeadersBaseConfig = "defconfig";

     

       6
       5
        
           kernelBaseConfig = "defconfig";

     

       7
       6
        
           # Build whatever possible as a module, if not stated in the extra config.

     

       8
       7
        
           kernelAutoModules = true;

     
···

       30
       29
        
           };

     

       31
       30
        
       

     

       32
       31
        
           kernelMajor = "2.6";

     

       33
       33
       -
           kernelHeadersBaseConfig = "multi_v5_defconfig";

     

       34
       32
        
           kernelBaseConfig = "multi_v5_defconfig";

     

       35
       33
        
           kernelArch = "arm";

     

       36
       34
        
           kernelAutoModules = false;

     
···

       54
       52
        
         sheevaplug = {

     

       55
       53
        
           name = "sheevaplug";

     

       56
       54
        
           kernelMajor = "2.6";

     

       57
       57
       -
           kernelHeadersBaseConfig = "multi_v5_defconfig";

     

       58
       55
        
           kernelBaseConfig = "multi_v5_defconfig";

     

       59
       56
        
           kernelArch = "arm";

     

       60
       57
        
           kernelAutoModules = false;

     
···

       168
       165
        
         raspberrypi = {

     

       169
       166
        
           name = "raspberrypi";

     

       170
       167
        
           kernelMajor = "2.6";

     

       171
       171
       -
           kernelHeadersBaseConfig = "bcm2835_defconfig";

     

       172
       168
        
           kernelBaseConfig = "bcmrpi_defconfig";

     

       173
       169
        
           kernelDTB = true;

     

       174
       170
        
           kernelArch = "arm";

     
···

       347
       343
        
         utilite = {

     

       348
       344
        
           name = "utilite";

     

       349
       345
        
           kernelMajor = "2.6";

     

       350
       350
       -
           kernelHeadersBaseConfig = "multi_v7_defconfig";

     

       351
       346
        
           kernelBaseConfig = "multi_v7_defconfig";

     

       352
       347
        
           kernelArch = "arm";

     

       353
       348
        
           kernelAutoModules = false;

     
···

       379
       374
        
           # patch.

     

       380
       375
        
       

     

       381
       376
        
           kernelBaseConfig = "guruplug_defconfig";

     

       382
       382
       -
           #kernelHeadersBaseConfig = "guruplug_defconfig";

     

       383
       377
        
         };

     

       384
       378
        
       

     

       385
       379
        
         fuloong2f_n32 = {

     

       386
       380
        
           name = "fuloong2f_n32";

     

       387
       381
        
           kernelMajor = "2.6";

     

       388
       388
       -
           kernelHeadersBaseConfig = "fuloong2e_defconfig";

     

       389
       382
        
           kernelBaseConfig = "lemote2f_defconfig";

     

       390
       383
        
           kernelArch = "mips";

     

       391
       384
        
           kernelAutoModules = false;

     
···

       471
       464
        
         armv7l-hf-multiplatform = {

     

       472
       465
        
           name = "armv7l-hf-multiplatform";

     

       473
       466
        
           kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.

     

       474
       474
       -
           kernelHeadersBaseConfig = "multi_v7_defconfig";

     

       475
       467
        
           kernelBaseConfig = "multi_v7_defconfig";

     

       476
       468
        
           kernelArch = "arm";

     

       477
       469
        
           kernelDTB = true;

     
···

       517
       509
        
         aarch64-multiplatform = {

     

       518
       510
        
           name = "aarch64-multiplatform";

     

       519
       511
        
           kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.

     

       520
       520
       -
           kernelHeadersBaseConfig = "defconfig";

     

       521
       512
        
           kernelBaseConfig = "defconfig";

     

       522
       513
        
           kernelArch = "arm64";

     

       523
       514
        
           kernelDTB = true;

+11

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

···

       145
       145
        
         </listitem>

     

       146
       146
        
         <listitem>

     

       147
       147
        
           <para>

     

       148
       148
       +
             The <literal>openssh</literal> package

     

       149
       149
       +
             now includes Kerberos support by default;

     

       150
       150
       +
             the <literal>openssh_with_kerberos</literal> package

     

       151
       151
       +
             is now a deprecated alias.

     

       152
       152
       +
             If you do not want Kerberos support,

     

       153
       153
       +
             you can do <literal>openssh.override { withKerboros = false; }</literal>.

     

       154
       154
       +
             Note, this also applies to the <literal>openssh_hpn</literal> package.

     

       155
       155
       +
           </para>

     

       156
       156
       +
         </listitem>

     

       157
       157
       +
         <listitem>

     

       158
       158
       +
           <para>

     

       148
       159
        
             <literal>cc-wrapper</literal> has been split in two; there is now also a <literal>bintools-wrapper</literal>.

     

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

     

       150
       161
        
             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>.

+1 -14

nixos/modules/services/networking/radvd.nix

···

       59
       59
        
       

     

       60
       60
        
           systemd.services.radvd =

     

       61
       61
        
             { description = "IPv6 Router Advertisement Daemon";

     

       62
       62
       -
       

     

       63
       62
        
               wantedBy = [ "multi-user.target" ];

     

       64
       64
       -
       

     

       65
       63
        
               after = [ "network.target" ];

     

       66
       66
       -
       

     

       67
       67
       -
               path = [ pkgs.radvd ];

     

       68
       68
       -
       

     

       69
       69
       -
               preStart = ''

     

       70
       70
       -
                 mkdir -m 755 -p /run/radvd

     

       71
       71
       -
                 chown radvd /run/radvd

     

       72
       72
       -
               '';

     

       73
       73
       -
       

     

       74
       64
        
               serviceConfig =

     

       75
       75
       -
                 { ExecStart = "@${pkgs.radvd}/sbin/radvd radvd"

     

       76
       76
       -
                     + " -p /run/radvd/radvd.pid -m syslog -u radvd -C ${confFile}";

     

       65
       65
       +
                 { ExecStart = "@${pkgs.radvd}/bin/radvd radvd -n -u radvd -C ${confFile}";

     

       77
       66
        
                   Restart = "always";

     

       78
       78
       -
                   Type = "forking";

     

       79
       79
       -
                   PIDFile = "/run/radvd/radvd.pid";

     

       80
       67
        
                 };

     

       81
       68
        
             };

     

       82
       69

-1

nixos/modules/system/boot/networkd.nix

···

       700
       700
        
       

     

       701
       701
        
           systemd.additionalUpstreamSystemUnits = [

     

       702
       702
        
             "systemd-networkd.service" "systemd-networkd-wait-online.service"

     

       703
       703
       -
             "org.freedesktop.network1.busname"

     

       704
       703
        
           ];

     

       705
       704
        
       

     

       706
       705
        
           systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links

+1 -1

nixos/modules/system/boot/resolved.nix

···

       126
       126
        
         config = mkIf cfg.enable {

     

       127
       127
        
       

     

       128
       128
        
           systemd.additionalUpstreamSystemUnits = [

     

       129
       129
       -
             "systemd-resolved.service" "org.freedesktop.resolve1.busname"

     

       129
       129
       +
             "systemd-resolved.service"

     

       130
       130
        
           ];

     

       131
       131
        
       

     

       132
       132
        
           systemd.services.systemd-resolved = {

+4 -13

nixos/modules/system/boot/systemd.nix

···

       14
       14
        
         upstreamSystemUnits =

     

       15
       15
        
           [ # Targets.

     

       16
       16
        
             "basic.target"

     

       17
       17
       -
             "busnames.target"

     

       18
       17
        
             "sysinit.target"

     

       19
       18
        
             "sockets.target"

     

       20
       19
        
             "exit.target"

     
···

       47
       46
        
       

     

       48
       47
        
             # Consoles.

     

       49
       48
        
             "getty.target"

     

       49
       49
       +
             "getty-pre.target"

     

       50
       50
        
             "getty@.service"

     

       51
       51
        
             "serial-getty@.service"

     

       52
       52
        
             "console-getty.service"

     
···

       63
       63
        
             "systemd-logind.service"

     

       64
       64
        
             "autovt@.service"

     

       65
       65
        
             "systemd-user-sessions.service"

     

       66
       66
       -
             "dbus-org.freedesktop.login1.service"

     

       67
       66
        
             "dbus-org.freedesktop.machine1.service"

     

       68
       68
       -
             "org.freedesktop.login1.busname"

     

       69
       69
       -
             "org.freedesktop.machine1.busname"

     

       70
       67
        
             "user@.service"

     

       71
       68
        
       

     

       72
       69
        
             # Journal.

     
···

       99
       96
        
             "swap.target"

     

       100
       97
        
             "dev-hugepages.mount"

     

       101
       98
        
             "dev-mqueue.mount"

     

       102
       102
       -
             "proc-sys-fs-binfmt_misc.mount"

     

       103
       99
        
             "sys-fs-fuse-connections.mount"

     

       104
       100
        
             "sys-kernel-config.mount"

     

       105
       101
        
             "sys-kernel-debug.mount"

     
···

       155
       151
        
             "systemd-tmpfiles-setup-dev.service"

     

       156
       152
        
       

     

       157
       153
        
             # Misc.

     

       158
       158
       -
             "org.freedesktop.systemd1.busname"

     

       159
       154
        
             "systemd-sysctl.service"

     

       160
       155
        
             "dbus-org.freedesktop.timedate1.service"

     

       161
       156
        
             "dbus-org.freedesktop.locale1.service"

     

       162
       157
        
             "dbus-org.freedesktop.hostname1.service"

     

       163
       163
       -
             "org.freedesktop.timedate1.busname"

     

       164
       164
       -
             "org.freedesktop.locale1.busname"

     

       165
       165
       -
             "org.freedesktop.hostname1.busname"

     

       166
       158
        
             "systemd-timedated.service"

     

       167
       159
        
             "systemd-localed.service"

     

       168
       160
        
             "systemd-hostnamed.service"

     

       169
       161
        
             "systemd-binfmt.service"

     

       170
       162
        
             "systemd-exit.service"

     

       163
       163
       +
             "systemd-update-done.service"

     

       171
       164
        
           ]

     

       172
       165
        
           ++ cfg.additionalUpstreamSystemUnits;

     

       173
       166
        
       

     
···

       182
       175
        
         upstreamUserUnits =

     

       183
       176
        
           [ "basic.target"

     

       184
       177
        
             "bluetooth.target"

     

       185
       185
       -
             "busnames.target"

     

       186
       178
        
             "default.target"

     

       187
       179
        
             "exit.target"

     

       188
       180
        
             "graphical-session-pre.target"

     
···

       789
       781
        
       

     

       790
       782
        
               # Keep a persistent journal. Note that systemd-tmpfiles will

     

       791
       783
        
               # set proper ownership/permissions.

     

       792
       792
       -
               # FIXME: revert to 0700 with systemd v233.

     

       793
       793
       -
               mkdir -m 0750 -p /var/log/journal

     

       784
       784
       +
               mkdir -m 0700 -p /var/log/journal

     

       794
       785
        
             '';

     

       795
       786
        
       

     

       796
       787
        
           users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;

     
···

       887
       878
        
           systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;

     

       888
       879
        
           systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;

     

       889
       880
        
           systemd.targets.network-online.wantedBy = [ "multi-user.target" ];

     

       890
       890
       -
           systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ];

     

       881
       881
       +
           systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ];

     

       891
       882
        
       

     

       892
       883
        
           # Don't bother with certain units in containers.

     

       893
       884
        
           systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";

+1 -1

pkgs/applications/audio/cdparanoia/default.nix

···

       17
       17
        
             url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff";

     

       18
       18
        
             sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad";

     

       19
       19
        
           })

     

       20
       20
       -
         ];

     

       20
       20
       +
         ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch;

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook;

     

       23
       23

+68

pkgs/applications/audio/cdparanoia/utils.patch

···

       1
       1
       +
       diff --git cdparanoia-III-10.2/interface/utils.h cdparanoia-III-10.2/interface/utils.h

     

       2
       2
       +
       index c9647da..68c1a3a 100644

     

       3
       3
       +
       --- cdparanoia-III-10.2/interface/utils.h

     

       4
       4
       +
       +++ cdparanoia-III-10.2/interface/utils.h

     

       5
       5
       +
       @@ -1,4 +1,6 @@

     

       6
       6
       +
       -#include <endian.h>

     

       7
       7
       +
       +#include <unistd.h>

     

       8
       8
       +
       +#include <stdint.h>

     

       9
       9
       +
       +#include <stdlib.h>

     

       10
       10
       +
        #include <stdio.h>

     

       11
       11
       +
        #include <errno.h>

     

       12
       12
       +
        #include <string.h>

     

       13
       13
       +
       @@ -14,15 +16,15 @@ static inline int bigendianp(void){

     

       14
       14
       +
        }

     

       15
       15
       +
        

     

       16
       16
       +
        static inline int32_t swap32(int32_t x){

     

       17
       17
       +
       -  return((((u_int32_t)x & 0x000000ffU) << 24) | 

     

       18
       18
       +
       -	 (((u_int32_t)x & 0x0000ff00U) <<  8) | 

     

       19
       19
       +
       -	 (((u_int32_t)x & 0x00ff0000U) >>  8) | 

     

       20
       20
       +
       -	 (((u_int32_t)x & 0xff000000U) >> 24));

     

       21
       21
       +
       +  return((((uint32_t)x & 0x000000ffU) << 24) | 

     

       22
       22
       +
       +	 (((uint32_t)x & 0x0000ff00U) <<  8) | 

     

       23
       23
       +
       +	 (((uint32_t)x & 0x00ff0000U) >>  8) | 

     

       24
       24
       +
       +	 (((uint32_t)x & 0xff000000U) >> 24));

     

       25
       25
       +
        }

     

       26
       26
       +
        

     

       27
       27
       +
        static inline int16_t swap16(int16_t x){

     

       28
       28
       +
       -  return((((u_int16_t)x & 0x00ffU) <<  8) | 

     

       29
       29
       +
       -	 (((u_int16_t)x & 0xff00U) >>  8));

     

       30
       30
       +
       +  return((((uint16_t)x & 0x00ffU) <<  8) | 

     

       31
       31
       +
       +	 (((uint16_t)x & 0xff00U) >>  8));

     

       32
       32
       +
        }

     

       33
       33
       +
        

     

       34
       34
       +
        #if BYTE_ORDER == LITTLE_ENDIAN

     

       35
       35
       +
       diff --git cdparanoia-III-10.2/utils.h cdparanoia-III-10.2/utils.h

     

       36
       36
       +
       index 10dce58..6211ce3 100644

     

       37
       37
       +
       --- cdparanoia-III-10.2/utils.h

     

       38
       38
       +
       +++ cdparanoia-III-10.2/utils.h

     

       39
       39
       +
       @@ -1,5 +1,6 @@

     

       40
       40
       +
       +#include <unistd.h>

     

       41
       41
       +
       +#include <stdint.h>

     

       42
       42
       +
        #include <stdlib.h>

     

       43
       43
       +
       -#include <endian.h>

     

       44
       44
       +
        #include <stdio.h>

     

       45
       45
       +
        #include <errno.h>

     

       46
       46
       +
        #include <string.h>

     

       47
       47
       +
       @@ -18,15 +19,15 @@ static inline int bigendianp(void){

     

       48
       48
       +
        }

     

       49
       49
       +
        

     

       50
       50
       +
        static inline int32_t swap32(int32_t x){

     

       51
       51
       +
       -  return((((u_int32_t)x & 0x000000ffU) << 24) | 

     

       52
       52
       +
       -	 (((u_int32_t)x & 0x0000ff00U) <<  8) | 

     

       53
       53
       +
       -	 (((u_int32_t)x & 0x00ff0000U) >>  8) | 

     

       54
       54
       +
       -	 (((u_int32_t)x & 0xff000000U) >> 24));

     

       55
       55
       +
       +  return((((uint32_t)x & 0x000000ffU) << 24) | 

     

       56
       56
       +
       +	 (((uint32_t)x & 0x0000ff00U) <<  8) | 

     

       57
       57
       +
       +	 (((uint32_t)x & 0x00ff0000U) >>  8) | 

     

       58
       58
       +
       +	 (((uint32_t)x & 0xff000000U) >> 24));

     

       59
       59
       +
        }

     

       60
       60
       +
        

     

       61
       61
       +
        static inline int16_t swap16(int16_t x){

     

       62
       62
       +
       -  return((((u_int16_t)x & 0x00ffU) <<  8) | 

     

       63
       63
       +
       -	 (((u_int16_t)x & 0xff00U) >>  8));

     

       64
       64
       +
       +  return((((uint16_t)x & 0x00ffU) <<  8) | 

     

       65
       65
       +
       +	 (((uint16_t)x & 0xff00U) >>  8));

     

       66
       66
       +
        }

     

       67
       67
       +
        

     

       68
       68
       +
        #if BYTE_ORDER == LITTLE_ENDIAN

+2 -1

pkgs/applications/editors/kakoune/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }:

     

       2
       2
        
       

     

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     
···

       11
       11
        
           rev = "7482d117cc85523e840dff595134dcb9cdc62207";

     

       12
       12
        
           sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh";

     

       13
       13
        
         };

     

       14
       14
       +
         nativeBuildInputs = [ pkgconfig ];

     

       14
       15
        
         buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];

     

       15
       16
        
       

     

       16
       17
        
         postPatch = ''

+7 -2

pkgs/applications/misc/xterm/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper

     

       2
       2
        
       , enableDecLocator ? true

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       20
       20
        
       

     

       21
       21
        
         patches = [

     

       22
       22
        
           ./sixel-256.support.patch

     

       23
       23
       -
         ];

     

       23
       23
       +
         ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl

     

       24
       24
       +
           (fetchpatch {

     

       25
       25
       +
             name = "posix-ptys.patch";

     

       26
       26
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";

     

       27
       27
       +
             sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr";

     

       28
       28
       +
           });

     

       24
       29
        
       

     

       25
       30
        
         configureFlags = [

     

       26
       31
        
           "--enable-wide-chars"

+6 -2

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

···

       53
       53
        
       

     

       54
       54
        
         hardeningDisable = [ "format" ];

     

       55
       55
        
       

     

       56
       56
       -
         configureFlags = "--with-ssl=${openssl.dev} --with-gc=${boehmgc.dev}"

     

       57
       57
       -
           + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb";

     

       56
       56
       +
         configureFlags =

     

       57
       57
       +
           [ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" ]

     

       58
       58
       +
           ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

     

       59
       59
       +
             "ac_cv_func_setpgrp_void=yes"

     

       60
       60
       +
           ]

     

       61
       61
       +
           ++ optional graphicsSupport "--enable-image=${optionalString x11Support "x11,"}fb";

     

       58
       62
        
       

     

       59
       63
        
         preConfigure = ''

     

       60
       64
        
           substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path

+7 -1

pkgs/applications/networking/sniffers/wireshark/default.nix

···

       40
       40
        
           ++ optionals stdenv.isLinux  [ libcap libnl ]

     

       41
       41
        
           ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];

     

       42
       42
        
       

     

       43
       43
       -
         patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];

     

       43
       43
       +
         patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]

     

       44
       44
       +
           # https://code.wireshark.org/review/#/c/23728/

     

       45
       45
       +
           ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {

     

       46
       46
       +
             name = "fix-timeout.patch";

     

       47
       47
       +
             url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0";

     

       48
       48
       +
             sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv";

     

       49
       49
       +
           });

     

       44
       50
        
       

     

       45
       51
        
         postInstall = optionalString (withQt || withGtk) ''

     

       46
       52
        
           ${optionalString withGtk ''

+19 -1

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

···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ cmake zlib boost.out boost.dev ];

     

       15
       15
       -
         NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ];

     

       15
       15
       +
         NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]

     

       16
       16
       +
           # Squelch endless stream of warnings on same few things

     

       17
       17
       +
           ++ stdenv.lib.optionals stdenv.cc.isClang [

     

       18
       18
       +
             "-Wno-empty-body"

     

       19
       19
       +
             "-Wno-tautological-compare"

     

       20
       20
       +
             "-Wc++11-compat-deprecated-writable-strings"

     

       21
       21
       +
             "-Wno-deprecated"

     

       22
       22
       +
           ];

     

       23
       23
       +
       

     

       24
       24
       +
         prePatch = ''

     

       25
       25
       +
           sed -i -e '1i#include <stdint.h>' abc/src/bdd/dsd/dsd.h

     

       26
       26
       +
           substituteInPlace abc/src/bdd/dsd/dsd.h --replace \

     

       27
       27
       +
                      '((Child = Dsd_NodeReadDec(Node,Index))>=0);' \

     

       28
       28
       +
                      '((intptr_t)(Child = Dsd_NodeReadDec(Node,Index))>=0);'

     

       29
       29
       +
       

     

       30
       30
       +
           patch -p1 -d minisat -i ${./minisat-fenv.patch}

     

       31
       31
       +
           patch -p1 -d glucose -i ${./glucose-fenv.patch}

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       16
       34
        
         patches =

     

       17
       35
        
           [ ./0001-no-static-boost-libs.patch

     

       18
       36
        
           ];

+65

pkgs/applications/science/logic/avy/glucose-fenv.patch

···

       1
       1
       +
       From d6e0cb60270e8653bda3f339e3a07ce2cd2d6eb0 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Will Dietz <w@wdtz.org>

     

       3
       3
       +
       Date: Tue, 17 Oct 2017 23:01:36 -0500

     

       4
       4
       +
       Subject: [PATCH] glucose: use fenv to set double precision

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        core/Main.cc   | 8 ++++++--

     

       8
       8
       +
        simp/Main.cc   | 8 ++++++--

     

       9
       9
       +
        utils/System.h | 2 +-

     

       10
       10
       +
        3 files changed, 13 insertions(+), 5 deletions(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/core/Main.cc b/core/Main.cc

     

       13
       13
       +
       index c96aadd..994132b 100644

     

       14
       14
       +
       --- a/core/Main.cc

     

       15
       15
       +
       +++ b/core/Main.cc

     

       16
       16
       +
       @@ -96,8 +96,12 @@ int main(int argc, char** argv)

     

       17
       17
       +
                // printf("This is MiniSat 2.0 beta\n");

     

       18
       18
       +
                

     

       19
       19
       +
        #if defined(__linux__)

     

       20
       20
       +
       -        fpu_control_t oldcw, newcw;

     

       21
       21
       +
       -        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);

     

       22
       22
       +
       +        fenv_t fenv;

     

       23
       23
       +
       +

     

       24
       24
       +
       +        fegetenv(&fenv);

     

       25
       25
       +
       +        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */

     

       26
       26
       +
       +        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */

     

       27
       27
       +
       +        fesetenv(&fenv);

     

       28
       28
       +
                printf("c WARNING: for repeatability, setting FPU to use double precision\n");

     

       29
       29
       +
        #endif

     

       30
       30
       +
                // Extra options:

     

       31
       31
       +
       diff --git a/simp/Main.cc b/simp/Main.cc

     

       32
       32
       +
       index 4f4772d..70c2e4b 100644

     

       33
       33
       +
       --- a/simp/Main.cc

     

       34
       34
       +
       +++ b/simp/Main.cc

     

       35
       35
       +
       @@ -97,8 +97,12 @@ int main(int argc, char** argv)

     

       36
       36
       +
                

     

       37
       37
       +
                

     

       38
       38
       +
        #if defined(__linux__)

     

       39
       39
       +
       -        fpu_control_t oldcw, newcw;

     

       40
       40
       +
       -        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);

     

       41
       41
       +
       +        fenv_t fenv;

     

       42
       42
       +
       +

     

       43
       43
       +
       +        fegetenv(&fenv);

     

       44
       44
       +
       +        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */

     

       45
       45
       +
       +        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */

     

       46
       46
       +
       +        fesetenv(&fenv);

     

       47
       47
       +
                printf("WARNING: for repeatability, setting FPU to use double precision\n");

     

       48
       48
       +
        #endif

     

       49
       49
       +
                // Extra options:

     

       50
       50
       +
       diff --git a/utils/System.h b/utils/System.h

     

       51
       51
       +
       index 004d498..a768e99 100644

     

       52
       52
       +
       --- a/utils/System.h

     

       53
       53
       +
       +++ b/utils/System.h

     

       54
       54
       +
       @@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA

     

       55
       55
       +
        #define Glucose_System_h

     

       56
       56
       +
        

     

       57
       57
       +
        #if defined(__linux__)

     

       58
       58
       +
       -#include <fpu_control.h>

     

       59
       59
       +
       +#include <fenv.h>

     

       60
       60
       +
        #endif

     

       61
       61
       +
        

     

       62
       62
       +
        #include "glucose/mtl/IntTypes.h"

     

       63
       63
       +
       -- 

     

       64
       64
       +
       2.14.2

     

       65
       65
       +

+65

pkgs/applications/science/logic/avy/minisat-fenv.patch

···

       1
       1
       +
       From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Will Dietz <w@wdtz.org>

     

       3
       3
       +
       Date: Tue, 17 Oct 2017 22:57:02 -0500

     

       4
       4
       +
       Subject: [PATCH] use fenv instead of non-standard fpu_control

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        core/Main.cc   | 8 ++++++--

     

       8
       8
       +
        simp/Main.cc   | 8 ++++++--

     

       9
       9
       +
        utils/System.h | 2 +-

     

       10
       10
       +
        3 files changed, 13 insertions(+), 5 deletions(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/core/Main.cc b/core/Main.cc

     

       13
       13
       +
       index 2b0d97b..8ad95fb 100644

     

       14
       14
       +
       --- a/core/Main.cc

     

       15
       15
       +
       +++ b/core/Main.cc

     

       16
       16
       +
       @@ -78,8 +78,12 @@ int main(int argc, char** argv)

     

       17
       17
       +
                // printf("This is MiniSat 2.0 beta\n");

     

       18
       18
       +
                

     

       19
       19
       +
        #if defined(__linux__)

     

       20
       20
       +
       -        fpu_control_t oldcw, newcw;

     

       21
       21
       +
       -        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);

     

       22
       22
       +
       +        fenv_t fenv;

     

       23
       23
       +
       +

     

       24
       24
       +
       +        fegetenv(&fenv);

     

       25
       25
       +
       +        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */

     

       26
       26
       +
       +        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */

     

       27
       27
       +
       +        fesetenv(&fenv);

     

       28
       28
       +
                printf("WARNING: for repeatability, setting FPU to use double precision\n");

     

       29
       29
       +
        #endif

     

       30
       30
       +
                // Extra options:

     

       31
       31
       +
       diff --git a/simp/Main.cc b/simp/Main.cc

     

       32
       32
       +
       index 2804d7f..39bfb71 100644

     

       33
       33
       +
       --- a/simp/Main.cc

     

       34
       34
       +
       +++ b/simp/Main.cc

     

       35
       35
       +
       @@ -79,8 +79,12 @@ int main(int argc, char** argv)

     

       36
       36
       +
                // printf("This is MiniSat 2.0 beta\n");

     

       37
       37
       +
                

     

       38
       38
       +
        #if defined(__linux__)

     

       39
       39
       +
       -        fpu_control_t oldcw, newcw;

     

       40
       40
       +
       -        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);

     

       41
       41
       +
       +        fenv_t fenv;

     

       42
       42
       +
       +

     

       43
       43
       +
       +        fegetenv(&fenv);

     

       44
       44
       +
       +        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */

     

       45
       45
       +
       +        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */

     

       46
       46
       +
       +        fesetenv(&fenv);

     

       47
       47
       +
                printf("WARNING: for repeatability, setting FPU to use double precision\n");

     

       48
       48
       +
        #endif

     

       49
       49
       +
                // Extra options:

     

       50
       50
       +
       diff --git a/utils/System.h b/utils/System.h

     

       51
       51
       +
       index 1758192..c0ad13a 100644

     

       52
       52
       +
       --- a/utils/System.h

     

       53
       53
       +
       +++ b/utils/System.h

     

       54
       54
       +
       @@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA

     

       55
       55
       +
        #define Minisat_System_h

     

       56
       56
       +
        

     

       57
       57
       +
        #if defined(__linux__)

     

       58
       58
       +
       -#include <fpu_control.h>

     

       59
       59
       +
       +#include <fenv.h>

     

       60
       60
       +
        #endif

     

       61
       61
       +
        

     

       62
       62
       +
        #include "mtl/IntTypes.h"

     

       63
       63
       +
       -- 

     

       64
       64
       +
       2.14.2

     

       65
       65
       +

+19 -1

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

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       1
       1
       +
       { stdenv, fetchurl, writeShellScriptBin }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       7
       7
        
           url    = "http://fmv.jku.at/boolector/boolector-${version}-with-lingeling-bbc.tar.bz2";

     

       8
       8
        
           sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045";

     

       9
       9
        
         };

     

       10
       10
       +
       

     

       11
       11
       +
         prePatch =

     

       12
       12
       +
           let

     

       13
       13
       +
             lingelingPatch = writeShellScriptBin "lingeling-patch" ''

     

       14
       14
       +
               sed -i -e "1i#include <stdint.h>" lingeling/lglib.h

     

       15
       15
       +
       

     

       16
       16
       +
               ${crossFix}/bin/crossFix lingeling

     

       17
       17
       +
             '';

     

       18
       18
       +
             crossFix = writeShellScriptBin "crossFix" ''

     

       19
       19
       +
               # substituteInPlace not available here

     

       20
       20
       +
               sed -i $1/makefile.in \

     

       21
       21
       +
                 -e 's@ar rc@$(AR) rc@' \

     

       22
       22
       +
                 -e 's@ranlib@$(RANLIB)@'

     

       23
       23
       +
             '';

     

       24
       24
       +
           in ''

     

       25
       25
       +
           sed -i -e 's@mv lingeling\* lingeling@\0 \&\& ${lingelingPatch}/bin/lingeling-patch@' makefile

     

       26
       26
       +
           sed -i -e 's@mv boolector\* boolector@\0 \&\& ${crossFix}/bin/crossFix boolector@' makefile

     

       27
       27
       +
         '';

     

       10
       28
        
       

     

       11
       29
        
         installPhase = ''

     

       12
       30
        
           mkdir $out

+7

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

···

       22
       22
        
           "--with-boost=${boost.dev}"

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       +
         prePatch = ''

     

       26
       26
       +
           patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat

     

       27
       27
       +
           patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       25
       30
        
         preConfigure = ''

     

       26
       31
        
           patchShebangs ./src/

     

       27
       32
        
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         enableParallelBuilding = true;

     

       28
       35
        
       

     

       29
       36
        
         meta = with stdenv.lib; {

     

       30
       37
        
           description = "A high-performance theorem prover and SMT solver";

+65

pkgs/applications/science/logic/cvc4/minisat-fenv.patch

···

       1
       1
       +
       From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Will Dietz <w@wdtz.org>

     

       3
       3
       +
       Date: Tue, 17 Oct 2017 22:57:02 -0500

     

       4
       4
       +
       Subject: [PATCH] use fenv instead of non-standard fpu_control

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        core/Main.cc   | 8 ++++++--

     

       8
       8
       +
        simp/Main.cc   | 8 ++++++--

     

       9
       9
       +
        utils/System.h | 2 +-

     

       10
       10
       +
        3 files changed, 13 insertions(+), 5 deletions(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/core/Main.cc b/core/Main.cc

     

       13
       13
       +
       index 2b0d97b..8ad95fb 100644

     

       14
       14
       +
       --- a/core/Main.cc

     

       15
       15
       +
       +++ b/core/Main.cc

     

       16
       16
       +
       @@ -78,8 +78,12 @@ int main(int argc, char** argv)

     

       17
       17
       +
                // printf("This is MiniSat 2.0 beta\n");

     

       18
       18
       +
                

     

       19
       19
       +
        #if defined(__linux__)

     

       20
       20
       +
       -        fpu_control_t oldcw, newcw;

     

       21
       21
       +
       -        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);

     

       22
       22
       +
       +        fenv_t fenv;

     

       23
       23
       +
       +

     

       24
       24
       +
       +        fegetenv(&fenv);

     

       25
       25
       +
       +        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */

     

       26
       26
       +
       +        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */

     

       27
       27
       +
       +        fesetenv(&fenv);

     

       28
       28
       +
                printf("WARNING: for repeatability, setting FPU to use double precision\n");

     

       29
       29
       +
        #endif

     

       30
       30
       +
                // Extra options:

     

       31
       31
       +
       diff --git a/simp/Main.cc b/simp/Main.cc

     

       32
       32
       +
       index 2804d7f..39bfb71 100644

     

       33
       33
       +
       --- a/simp/Main.cc

     

       34
       34
       +
       +++ b/simp/Main.cc

     

       35
       35
       +
       @@ -79,8 +79,12 @@ int main(int argc, char** argv)

     

       36
       36
       +
                // printf("This is MiniSat 2.0 beta\n");

     

       37
       37
       +
                

     

       38
       38
       +
        #if defined(__linux__)

     

       39
       39
       +
       -        fpu_control_t oldcw, newcw;

     

       40
       40
       +
       -        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);

     

       41
       41
       +
       +        fenv_t fenv;

     

       42
       42
       +
       +

     

       43
       43
       +
       +        fegetenv(&fenv);

     

       44
       44
       +
       +        fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */

     

       45
       45
       +
       +        fenv.__control_word |= 0x200; /* _FPU_DOUBLE */

     

       46
       46
       +
       +        fesetenv(&fenv);

     

       47
       47
       +
                printf("WARNING: for repeatability, setting FPU to use double precision\n");

     

       48
       48
       +
        #endif

     

       49
       49
       +
                // Extra options:

     

       50
       50
       +
       diff --git a/utils/System.h b/utils/System.h

     

       51
       51
       +
       index 1758192..c0ad13a 100644

     

       52
       52
       +
       --- a/utils/System.h

     

       53
       53
       +
       +++ b/utils/System.h

     

       54
       54
       +
       @@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA

     

       55
       55
       +
        #define Minisat_System_h

     

       56
       56
       +
        

     

       57
       57
       +
        #if defined(__linux__)

     

       58
       58
       +
       -#include <fpu_control.h>

     

       59
       59
       +
       +#include <fenv.h>

     

       60
       60
       +
        #endif

     

       61
       61
       +
        

     

       62
       62
       +
        #include "mtl/IntTypes.h"

     

       63
       63
       +
       -- 

     

       64
       64
       +
       2.14.2

     

       65
       65
       +

+8

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

···

       9
       9
        
           sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         prePatch = ''

     

       13
       13
       +
           substituteInPlace picosat.c --replace "sys/unistd.h" "unistd.h"

     

       14
       14
       +
       

     

       15
       15
       +
           substituteInPlace makefile.in \

     

       16
       16
       +
             --replace 'ar rc' '$(AR) rc' \

     

       17
       17
       +
             --replace 'ranlib' '$(RANLIB)'

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       12
       20
        
         configurePhase = "./configure.sh --shared --trace";

     

       13
       21
        
       

     

       14
       22
        
         installPhase = ''

+4 -1

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

···

       57
       57
        
         makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "

     

       58
       58
        
             + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")

     

       59
       59
        
             + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")

     

       60
       60
       -
             + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ");

     

       60
       60
       +
             + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ")

     

       61
       61
       +
             # XXX: USE_PCRE2 might be useful in general, look into it

     

       62
       62
       +
             # XXX other alpine options?

     

       63
       63
       +
             + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else "");

     

       61
       64
        
       

     

       62
       65
        
         # build git-credential-osxkeychain if darwin

     

       63
       66
        
         postBuild = stdenv.lib.optionalString stdenv.isDarwin ''

+1

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

···

       51
       51
        
         # shell glob that ought to match it.

     

       52
       52
        
         dynamicLinker =

     

       53
       53
        
           /**/ if libc == null then null

     

       54
       54
       +
           else if targetPlatform.libc == "musl"             then "${libc_lib}/lib/ld-musl-*"

     

       54
       55
        
           else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"

     

       55
       56
        
           else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"

     

       56
       57
        
           # ARM with a wildcard, which can be "" or "-armhf".

+1 -1

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

···

       169
       169
        
                 # To keep ABI compatibility with upstream mingw-w64

     

       170
       170
        
                 "--enable-fully-dynamic-string"

     

       171
       171
        
               ] else

     

       172
       172
       -
                 optionals (targetPlatform.libc == "uclibc") [

     

       172
       172
       +
                 optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [

     

       173
       173
        
                   # In uclibc cases, libgomp needs an additional '-ldl'

     

       174
       174
        
                   # and as I don't know how to pass it, I disable libgomp.

     

       175
       175
        
                   "--disable-libgomp"

+1 -1

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

···

       160
       160
        
                 # To keep ABI compatibility with upstream mingw-w64

     

       161
       161
        
                 "--enable-fully-dynamic-string"

     

       162
       162
        
               ] else

     

       163
       163
       -
                 optionals (targetPlatform.libc == "uclibc") [

     

       163
       163
       +
                 optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [

     

       164
       164
        
                   # libsanitizer requires netrom/netrom.h which is not

     

       165
       165
        
                   # available in uclibc.

     

       166
       166
        
                   "--disable-libsanitizer"

+18 -6

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

···

       1
       1
       -
       { stdenv, targetPackages, fetchurl, noSysDirs

     

       1
       1
       +
       { stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs

     

       2
       2
        
       , langC ? true, langCC ? true, langFortran ? false

     

       3
       3
        
       , langObjC ? targetPlatform.isDarwin

     

       4
       4
        
       , langObjCpp ? targetPlatform.isDarwin

     
···

       74
       74
        
       

     

       75
       75
        
             # This could be applied unconditionally but I don't want to cause a full

     

       76
       76
        
             # Linux rebuild.

     

       77
       77
       -
             ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch;

     

       77
       77
       +
             ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch

     

       78
       78
       +
             ++ optional stdenv.hostPlatform.isMusl (fetchpatch {

     

       79
       79
       +
               url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;

     

       80
       80
       +
               sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";

     

       81
       81
       +
             });

     

       78
       82
        
       

     

       79
       83
        
           javaEcj = fetchurl {

     

       80
       84
        
             # The `$(top_srcdir)/ecj.jar' file is automatically picked up at

     
···

       160
       164
        
                 # To keep ABI compatibility with upstream mingw-w64

     

       161
       165
        
                 "--enable-fully-dynamic-string"

     

       162
       166
        
               ] else

     

       163
       163
       -
                 optionals (targetPlatform.libc == "uclibc") [

     

       167
       167
       +
                 optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [

     

       164
       168
        
                   # libsanitizer requires netrom/netrom.h which is not

     

       165
       169
        
                   # available in uclibc.

     

       166
       170
        
                   "--disable-libsanitizer"

     
···

       258
       262
        
             let

     

       259
       263
        
               libc = if libcCross != null then libcCross else stdenv.cc.libc;

     

       260
       264
        
             in

     

       261
       261
       -
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."

     

       265
       265
       +
               (

     

       266
       266
       +
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..."

     

       262
       267
        
                  for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

     

       263
       268
        
                  do

     

       264
       264
       -
                    grep -q LIBC_DYNAMIC_LINKER "$header" || continue

     

       269
       269
       +
                    grep -q _DYNAMIC_LINKER "$header" || continue

     

       265
       270
        
                    echo "  fixing \`$header'..."

     

       266
       271
        
                    sed -i "$header" \

     

       267
       267
       -
                        -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'

     

       272
       272
       +
                        -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \

     

       273
       273
       +
                        -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'

     

       268
       274
        
                  done

     

       269
       275
        
               ''

     

       276
       276
       +
               + stdenv.lib.optionalString (targetPlatform.libc == "musl")

     

       277
       277
       +
               ''

     

       278
       278
       +
                   sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'

     

       279
       279
       +
               ''

     

       280
       280
       +
               )

     

       270
       281
        
           else null;

     

       271
       282
        
       

     

       272
       283
        
         # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,

     
···

       396
       407
        
             # On Illumos/Solaris GNU as is preferred

     

       397
       408
        
             "--with-gnu-as" "--without-gnu-ld"

     

       398
       409
        
           ]

     

       410
       410
       +
           ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"

     

       399
       411
        
         ;

     

       400
       412
        
       

     

       401
       413
        
         targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

+17 -4

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

···

       142
       142
        
               "--disable-shared"

     

       143
       143
        
               "--disable-libatomic"  # libatomic requires libc

     

       144
       144
        
               "--disable-decimal-float" # libdecnumber requires libc

     

       145
       145
       +
               # maybe only needed on musl, PATH_MAX

     

       146
       146
       +
               # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62

     

       147
       147
       +
               "--disable-libmpx"

     

       145
       148
        
             ] else [

     

       146
       149
        
               (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"

     

       147
       150
        
                else                "--with-headers=${getDev libcCross}/include")

     
···

       158
       161
        
                 # To keep ABI compatibility with upstream mingw-w64

     

       159
       162
        
                 "--enable-fully-dynamic-string"

     

       160
       163
        
               ] else

     

       161
       161
       -
                 optionals (targetPlatform.libc == "uclibc") [

     

       164
       164
       +
                 optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [

     

       162
       165
        
                   # libsanitizer requires netrom/netrom.h which is not

     

       163
       166
        
                   # available in uclibc.

     

       164
       167
        
                   "--disable-libsanitizer"

     

       165
       168
        
                   # In uclibc cases, libgomp needs an additional '-ldl'

     

       166
       169
        
                   # and as I don't know how to pass it, I disable libgomp.

     

       167
       170
        
                   "--disable-libgomp"

     

       171
       171
       +
                   # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865

     

       172
       172
       +
                   "--disable-libmpx"

     

       168
       173
        
                 ] ++ [

     

       169
       174
        
                 "--enable-threads=posix"

     

       170
       175
        
                 "--enable-nls"

     
···

       257
       262
        
             let

     

       258
       263
        
               libc = if libcCross != null then libcCross else stdenv.cc.libc;

     

       259
       264
        
             in

     

       260
       260
       -
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."

     

       265
       265
       +
               (

     

       266
       266
       +
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..."

     

       261
       267
        
                  for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

     

       262
       268
        
                  do

     

       263
       263
       -
                    grep -q LIBC_DYNAMIC_LINKER "$header" || continue

     

       269
       269
       +
                    grep -q _DYNAMIC_LINKER "$header" || continue

     

       264
       270
        
                    echo "  fixing \`$header'..."

     

       265
       271
        
                    sed -i "$header" \

     

       266
       266
       -
                        -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'

     

       272
       272
       +
                        -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \

     

       273
       273
       +
                        -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'

     

       267
       274
        
                  done

     

       268
       275
        
               ''

     

       276
       276
       +
               + stdenv.lib.optionalString (targetPlatform.libc == "musl")

     

       277
       277
       +
               ''

     

       278
       278
       +
                   sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'

     

       279
       279
       +
               ''

     

       280
       280
       +
               )

     

       269
       281
        
           else null;

     

       270
       282
        
       

     

       271
       283
        
         # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,

     
···

       399
       411
        
             # On Illumos/Solaris GNU as is preferred

     

       400
       412
        
             "--with-gnu-as" "--without-gnu-ld"

     

       401
       413
        
           ]

     

       414
       414
       +
           ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"

     

       402
       415
        
         ;

     

       403
       416
        
       

     

       404
       417
        
         targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

+43

pkgs/development/compilers/gcc/6/fix-objdump-check.patch

···

       1
       1
       +
       commit 4c38abe0967bad78dd6baa61c86923e4d4b346d3

     

       2
       2
       +
       Author: Ben Gamari <ben@smart-cactus.org>

     

       3
       3
       +
       Date:   Sun Nov 5 13:14:19 2017 -0500

     

       4
       4
       +
       

     

       5
       5
       +
           Fix it

     

       6
       6
       +
       

     

       7
       7
       +
       diff --git a/config/gcc-plugin.m4 b/config/gcc-plugin.m4

     

       8
       8
       +
       index dd06a58..f4435b8 100644

     

       9
       9
       +
       --- a/config/gcc-plugin.m4

     

       10
       10
       +
       +++ b/config/gcc-plugin.m4

     

       11
       11
       +
       @@ -13,6 +13,32 @@ dnl the same distribution terms as the rest of that program.

     

       12
       12
       +
        # Sets the shell variables enable_plugin and pluginlibs.

     

       13
       13
       +
        AC_DEFUN([GCC_ENABLE_PLUGINS],

     

       14
       14
       +
          [# Check for plugin support

     

       15
       15
       +
       +

     

       16
       16
       +
       +   # Figure out what objdump we will be using.

     

       17
       17
       +
       +   AS_VAR_SET_IF(gcc_cv_objdump,, [

     

       18
       18
       +
       +   if test -f $gcc_cv_binutils_srcdir/configure.ac \

     

       19
       19
       +
       +        && test -f ../binutils/Makefile \

     

       20
       20
       +
       +        && test x$build = x$host; then

     

       21
       21
       +
       +   	# Single tree build which includes binutils.

     

       22
       22
       +
       +   	gcc_cv_objdump=../binutils/objdump$build_exeext

     

       23
       23
       +
       +   elif test -x objdump$build_exeext; then

     

       24
       24
       +
       +   	gcc_cv_objdump=./objdump$build_exeext

     

       25
       25
       +
       +   elif ( set dummy $OBJDUMP_FOR_TARGET; test -x $[2] ); then

     

       26
       26
       +
       +           gcc_cv_objdump="$OBJDUMP_FOR_TARGET"

     

       27
       27
       +
       +   else

     

       28
       28
       +
       +           AC_PATH_PROG(gcc_cv_objdump, $OBJDUMP_FOR_TARGET)

     

       29
       29
       +
       +   fi])

     

       30
       30
       +
       +   

     

       31
       31
       +
       +   AC_MSG_CHECKING(what objdump to use)

     

       32
       32
       +
       +   if test "$gcc_cv_objdump" = ../binutils/objdump$build_exeext; then

     

       33
       33
       +
       +   	# Single tree build which includes binutils.

     

       34
       34
       +
       +   	AC_MSG_RESULT(newly built objdump)

     

       35
       35
       +
       +   elif test x$gcc_cv_objdump = x; then

     

       36
       36
       +
       +   	AC_MSG_RESULT(not found)

     

       37
       37
       +
       +   else

     

       38
       38
       +
       +   	AC_MSG_RESULT($gcc_cv_objdump)

     

       39
       39
       +
       +   fi

     

       40
       40
       +
       +

     

       41
       41
       +
           AC_ARG_ENABLE(plugin,

     

       42
       42
       +
           [AS_HELP_STRING([--enable-plugin], [enable plugin support])],

     

       43
       43
       +
           enable_plugin=$enableval,

+17 -5

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

···

       1
       1
       -
       { stdenv, targetPackages, fetchurl, noSysDirs

     

       1
       1
       +
       { stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs

     

       2
       2
        
       , langC ? true, langCC ? true, langFortran ? false

     

       3
       3
        
       , langObjC ? targetPlatform.isDarwin

     

       4
       4
        
       , langObjCpp ? targetPlatform.isDarwin

     
···

       67
       67
        
             [ ]

     

       68
       68
        
             ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch

     

       69
       69
        
             ++ optional noSysDirs ../no-sys-dirs.patch

     

       70
       70
       +
             ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied

     

       71
       71
       +
               url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";

     

       72
       72
       +
               sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";

     

       73
       73
       +
             })

     

       70
       74
        
             # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

     

       71
       75
        
             # target libraries and tools.

     

       72
       76
        
             ++ optional langAda ../gnat-cflags.patch

     
···

       156
       160
        
                 # To keep ABI compatibility with upstream mingw-w64

     

       157
       161
        
                 "--enable-fully-dynamic-string"

     

       158
       162
        
               ] else

     

       159
       159
       -
                 optionals (targetPlatform.libc == "uclibc") [

     

       163
       163
       +
                 optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [

     

       160
       164
        
                   # libsanitizer requires netrom/netrom.h which is not

     

       161
       165
        
                   # available in uclibc.

     

       162
       166
        
                   "--disable-libsanitizer"

     
···

       254
       258
        
             let

     

       255
       259
        
               libc = if libcCross != null then libcCross else stdenv.cc.libc;

     

       256
       260
        
             in

     

       257
       257
       -
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."

     

       261
       261
       +
               (

     

       262
       262
       +
               '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..."

     

       258
       263
        
                  for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h

     

       259
       264
        
                  do

     

       260
       260
       -
                    grep -q LIBC_DYNAMIC_LINKER "$header" || continue

     

       265
       265
       +
                    grep -q _DYNAMIC_LINKER "$header" || continue

     

       261
       266
        
                    echo "  fixing \`$header'..."

     

       262
       267
        
                    sed -i "$header" \

     

       263
       263
       -
                        -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'

     

       268
       268
       +
                        -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \

     

       269
       269
       +
                        -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'

     

       264
       270
        
                  done

     

       265
       271
        
               ''

     

       272
       272
       +
               + stdenv.lib.optionalString (hostPlatform.libc == "musl")

     

       273
       273
       +
               ''

     

       274
       274
       +
                   sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'

     

       275
       275
       +
               ''

     

       276
       276
       +
               )

     

       266
       277
        
           else null;

     

       267
       278
        
       

     

       268
       279
        
         # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,

     
···

       392
       403
        
             # On Illumos/Solaris GNU as is preferred

     

       393
       404
        
             "--with-gnu-as" "--without-gnu-ld"

     

       394
       405
        
           ]

     

       406
       406
       +
           ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"

     

       395
       407
        
         ;

     

       396
       408
        
       

     

       397
       409
        
         targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

+2 -1

pkgs/development/compilers/go/1.8.nix

···

       38
       38
        
         nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]

     

       39
       39
        
           ++ optionals stdenv.isLinux [ procps ];

     

       40
       40
        
         buildInputs = [ cacert pcre ]

     

       41
       41
       -
           ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];

     

       41
       41
       +
           ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]

     

       42
       42
       +
           ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];

     

       42
       43
        
         propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];

     

       43
       44
        
       

     

       44
       45
        
         hardeningDisable = [ "all" ];

+2 -1

pkgs/development/compilers/go/1.9.nix

···

       38
       38
        
         nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]

     

       39
       39
        
           ++ optionals stdenv.isLinux [ procps ];

     

       40
       40
        
         buildInputs = [ cacert pcre ]

     

       41
       41
       -
           ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];

     

       41
       41
       +
           ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]

     

       42
       42
       +
           ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];

     

       42
       43
        
         propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];

     

       43
       44
        
       

     

       44
       45
        
         hardeningDisable = [ "all" ];

+1 -1

pkgs/development/compilers/llvm/4/llvm.nix

···

       65
       65
        
           substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib

     

       66
       66
        
           patch -p1 < ./llvm-outputs.patch

     

       67
       67
        
         ''

     

       68
       68
       -
         + stdenv.lib.optionalString (stdenv ? glibc) ''

     

       68
       68
       +
         + ''

     

       69
       69
        
           (

     

       70
       70
        
             cd projects/compiler-rt

     

       71
       71
        
             patch -p1 < ${

+2 -2

pkgs/development/compilers/zig/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, llvmPackages }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "0.1.1";

     
···

       11
       11
        
           sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ];

     

       14
       14
       +
         buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ];

     

       15
       15
        
       

     

       16
       16
        
         cmakeFlags = [

     

       17
       17
        
           "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"

+1 -1

pkgs/development/haskell-modules/configuration-nix.nix

···

       258
       258
        
             }

     

       259
       259
        
           );

     

       260
       260
        
       

     

       261
       261
       -
         llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_5; };

     

       261
       261
       +
         llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; };

     

       262
       262
        
       

     

       263
       263
        
         # Needs help finding LLVM.

     

       264
       264
        
         spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;

+1 -1

pkgs/development/interpreters/lua-5/5.1.nix

···

       33
       33
        
           makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" CC="$CC" )

     

       34
       34
        
           installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' )

     

       35
       35
        
         '' else ''

     

       36
       36
       -
           makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" )

     

       36
       36
       +
           makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" CC="$CC" AR="$AR q" RANLIB="$RANLIB" )

     

       37
       37
        
           installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' )

     

       38
       38
        
         '';

     

       39
       39

+29 -4

pkgs/development/interpreters/python/cpython/2.7/default.nix

···

       1
       1
       -
       { stdenv, hostPlatform, fetchurl

     

       1
       1
       +
       { stdenv, hostPlatform, buildPlatform, buildPackages, fetchurl

     

       2
       2
        
       , bzip2

     

       3
       3
        
       , gdbm

     

       4
       4
        
       , fetchpatch

     
···

       88
       88
        
             # only works for GCC and Apple Clang. This makes distutils to call C++

     

       89
       89
        
             # compiler when needed.

     

       90
       90
        
             ./python-2.7-distutils-C++.patch

     

       91
       91
       -
       

     

       92
       91
        
           ];

     

       93
       92
        
       

     

       94
       93
        
         preConfigure = ''

     
···

       117
       116
        
           "ac_cv_func_bind_textdomain_codeset=yes"

     

       118
       117
        
         ] ++ optionals stdenv.isDarwin [

     

       119
       118
        
           "--disable-toolbox-glue"

     

       119
       119
       +
         ] ++ optionals (hostPlatform != buildPlatform) [

     

       120
       120
       +
           "PYTHON_FOR_BUILD=${getBin buildPackages.python}/bin/python"

     

       121
       121
       +
           "ac_cv_buggy_getaddrinfo=no"

     

       122
       122
       +
           # Assume little-endian IEEE 754 floating point when cross compiling

     

       123
       123
       +
           "ac_cv_little_endian_double=yes"

     

       124
       124
       +
           "ac_cv_big_endian_double=no"

     

       125
       125
       +
           "ac_cv_mixed_endian_double=no"

     

       126
       126
       +
           "ac_cv_x87_double_rounding=yes"

     

       127
       127
       +
           "ac_cv_tanh_preserves_zero_sign=yes"

     

       128
       128
       +
           # Generally assume that things are present and work

     

       129
       129
       +
           "ac_cv_posix_semaphores_enabled=yes"

     

       130
       130
       +
           "ac_cv_broken_sem_getvalue=no"

     

       131
       131
       +
           "ac_cv_wchar_t_signed=yes"

     

       132
       132
       +
           "ac_cv_rshift_extends_sign=yes"

     

       133
       133
       +
           "ac_cv_broken_nice=no"

     

       134
       134
       +
           "ac_cv_broken_poll=no"

     

       135
       135
       +
           "ac_cv_working_tzset=yes"

     

       136
       136
       +
           "ac_cv_have_long_long_format=yes"

     

       137
       137
       +
           "ac_cv_have_size_t_format=yes"

     

       138
       138
       +
           "ac_cv_computed_gotos=yes"

     

       139
       139
       +
           "ac_cv_file__dev_ptmx=yes"

     

       140
       140
       +
           "ac_cv_file__dev_ptc=yes"

     

       120
       141
        
         ];

     

       121
       142
        
       

     

       122
       143
        
         postConfigure = if hostPlatform.isCygwin then ''

     
···

       131
       152
        
           ++ [ db gdbm ncurses sqlite readline ]

     

       132
       153
        
           ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]

     

       133
       154
        
           ++ optionals stdenv.isDarwin ([ CF ] ++ optional (configd != null) configd);

     

       155
       155
       +
         nativeBuildInputs =

     

       156
       156
       +
           optionals (hostPlatform != buildPlatform)

     

       157
       157
       +
           [ buildPackages.stdenv.cc buildPackages.python ];

     

       134
       158
        
       

     

       135
       159
        
         mkPaths = paths: {

     

       136
       160
        
           C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;

     
···

       144
       168
        
           name = "python-${version}";

     

       145
       169
        
           pythonVersion = majorVersion;

     

       146
       170
        
       

     

       147
       147
       -
           inherit majorVersion version src patches buildInputs

     

       171
       171
       +
           inherit majorVersion version src patches buildInputs nativeBuildInputs

     

       148
       172
        
                   preConfigure configureFlags;

     

       149
       173
        
       

     

       150
       174
        
           LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";

     
···

       187
       211
        
               # Determinism: Windows installers were not deterministic.

     

       188
       212
        
               # We're also not interested in building Windows installers.

     

       189
       213
        
               find "$out" -name 'wininst*.exe' | xargs -r rm -f

     

       190
       190
       -
       

     

       214
       214
       +
             '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform)

     

       215
       215
       +
             ''

     

       191
       216
        
               # Determinism: rebuild all bytecode

     

       192
       217
        
               # We exclude lib2to3 because that's Python 2 code which fails

     

       193
       218
        
               # We rebuild three times, once for each optimization level

+27 -3

pkgs/development/interpreters/python/cpython/3.6/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, buildPackages

     

       2
       2
        
       , glibc

     

       3
       3
        
       , bzip2

     

       4
       4
        
       , expat

     
···

       39
       39
        
           ++ optionals x11Support [ tcl tk libX11 xproto ]

     

       40
       40
        
           ++ optionals stdenv.isDarwin [ CF configd ];

     

       41
       41
        
       

     

       42
       42
       +
         nativeBuildInputs =

     

       43
       43
       +
           optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.python3;

     

       44
       44
       +
       

     

       42
       45
        
       in stdenv.mkDerivation {

     

       43
       46
        
         name = "python3-${version}";

     

       44
       47
        
         pythonVersion = majorVersion;

     

       45
       48
        
         inherit majorVersion version;

     

       46
       49
        
       

     

       47
       47
       -
         inherit buildInputs;

     

       50
       50
       +
         inherit buildInputs nativeBuildInputs;

     

       48
       51
        
       

     

       49
       52
        
         src = fetchurl {

     

       50
       53
        
           url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";

     
···

       87
       90
        
           "--without-ensurepip"

     

       88
       91
        
           "--with-system-expat"

     

       89
       92
        
           "--with-system-ffi"

     

       93
       93
       +
         ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       94
       94
       +
           "ac_cv_buggy_getaddrinfo=no"

     

       95
       95
       +
           # Assume little-endian IEEE 754 floating point when cross compiling

     

       96
       96
       +
           "ac_cv_little_endian_double=yes"

     

       97
       97
       +
           "ac_cv_big_endian_double=no"

     

       98
       98
       +
           "ac_cv_mixed_endian_double=no"

     

       99
       99
       +
           "ac_cv_x87_double_rounding=yes"

     

       100
       100
       +
           "ac_cv_tanh_preserves_zero_sign=yes"

     

       101
       101
       +
           # Generally assume that things are present and work

     

       102
       102
       +
           "ac_cv_posix_semaphores_enabled=yes"

     

       103
       103
       +
           "ac_cv_broken_sem_getvalue=no"

     

       104
       104
       +
           "ac_cv_wchar_t_signed=yes"

     

       105
       105
       +
           "ac_cv_rshift_extends_sign=yes"

     

       106
       106
       +
           "ac_cv_broken_nice=no"

     

       107
       107
       +
           "ac_cv_broken_poll=no"

     

       108
       108
       +
           "ac_cv_working_tzset=yes"

     

       109
       109
       +
           "ac_cv_have_long_long_format=yes"

     

       110
       110
       +
           "ac_cv_have_size_t_format=yes"

     

       111
       111
       +
           "ac_cv_computed_gotos=yes"

     

       112
       112
       +
           "ac_cv_file__dev_ptmx=yes"

     

       113
       113
       +
           "ac_cv_file__dev_ptc=yes"

     

       90
       114
        
         ];

     

       91
       115
        
       

     

       92
       116
        
         preConfigure = ''

     
···

       139
       163
        
           for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do

     

       140
       164
        
             sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"

     

       141
       165
        
           done

     

       142
       142
       -
       

     

       166
       166
       +
         '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''

     

       143
       167
        
           # Determinism: rebuild all bytecode

     

       144
       168
        
           # We exclude lib2to3 because that's Python 2 code which fails

     

       145
       169
        
           # We rebuild three times, once for each optimization level

+20 -6

pkgs/development/interpreters/ruby/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub

     

       1
       1
       +
       { stdenv, buildPackages, lib

     

       2
       2
       +
       , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub

     

       2
       3
        
       , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison

     

       3
       4
        
       , autoconf, darwin ? null

     

       4
       5
        
       , buildEnv, bundler, bundix, Foundation

     
···

       22
       23
        
         # Contains the ruby version heuristics

     

       23
       24
        
         rubyVersion = import ./ruby-version.nix { inherit lib; };

     

       24
       25
        
       

     

       26
       26
       +
         # Needed during postInstall

     

       27
       27
       +
         buildRuby =

     

       28
       28
       +
           if stdenv.hostPlatform == stdenv.buildPlatform

     

       29
       29
       +
           then "$out/bin/ruby"

     

       30
       30
       +
           else "${buildPackages.ruby}/bin/ruby";

     

       31
       31
       +
       

     

       25
       32
        
         generic = { version, sha256 }: let

     

       26
       33
        
           ver = version;

     

       27
       34
        
           tag = ver.gitTag;

     
···

       30
       37
        
           isRuby25 = ver.majMin == "2.5";

     

       31
       38
        
           baseruby = self.override { useRailsExpress = false; };

     

       32
       39
        
           self = lib.makeOverridable (

     

       33
       33
       -
             { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub

     

       40
       40
       +
         { stdenv, buildPackages, lib

     

       41
       41
       +
             , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub

     

       34
       42
        
             , useRailsExpress ? true

     

       35
       43
        
             , zlib, zlibSupport ? true

     

       36
       44
        
             , openssl, opensslSupport ? true

     
···

       65
       73
        
                   unpackdir rubySrc;

     

       66
       74
        
       

     

       67
       75
        
               # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.

     

       68
       68
       -
               NROFF = "${groff}/bin/nroff";

     

       76
       76
       +
               NROFF = if docSupport then "${groff}/bin/nroff" else null;

     

       69
       77
        
       

     

       70
       70
       -
               nativeBuildInputs = ops useRailsExpress [ autoreconfHook bison ];

     

       78
       78
       +
               nativeBuildInputs =

     

       79
       79
       +
                    ops useRailsExpress [ autoreconfHook bison ]

     

       80
       80
       +
                 ++ ops (stdenv.buildPlatform != stdenv.hostPlatform) [

     

       81
       81
       +
                      buildPackages.ruby

     

       82
       82
       +
                    ];

     

       71
       83
        
               buildInputs =

     

       72
       84
        
                    (op fiddleSupport libffi)

     

       73
       85
        
                 ++ (ops cursesSupport [ ncurses readline ])

     
···

       120
       132
        
                   "--with-out-ext=tk"

     

       121
       133
        
                   # on yosemite, "generating encdb.h" will hang for a very long time without this flag

     

       122
       134
        
                   "--with-setjmp-type=setjmp"

     

       123
       123
       -
                 ];

     

       135
       135
       +
                 ]

     

       136
       136
       +
                 ++ op (stdenv.hostPlatform != stdenv.buildPlatform)

     

       137
       137
       +
                    "--with-baseruby=${buildRuby}";

     

       124
       138
        
       

     

       125
       139
        
               installFlags = stdenv.lib.optionalString docSupport "install-doc";

     

       126
       140
        
               # Bundler tries to create this directory

     

       127
       141
        
               postInstall = ''

     

       128
       142
        
                 # Update rubygems

     

       129
       143
        
                 pushd rubygems

     

       130
       130
       -
                 $out/bin/ruby setup.rb

     

       144
       144
       +
                 ${buildRuby} setup.rb

     

       131
       145
        
                 popd

     

       132
       146
        
       

     

       133
       147
        
                 # Remove unnecessary groff reference from runtime closure, since it's big

+3 -2

pkgs/development/libraries/SDL/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv

     

       2
       2
        
       , openglSupport ? false, mesa_noglu, mesa_glu

     

       3
       3
        
       , alsaSupport ? true, alsaLib

     

       4
       4
        
       , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr

     
···

       40
       40
        
         buildInputs = let

     

       41
       41
        
           notMingw = !hostPlatform.isMinGW;

     

       42
       42
        
         in optional notMingw audiofile

     

       43
       43
       -
         ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ];

     

       43
       43
       +
         ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ]

     

       44
       44
       +
         ++ [ libiconv ];

     

       44
       45
        
       

     

       45
       46
        
         # XXX: By default, SDL wants to dlopen() PulseAudio, in which case

     

       46
       47
        
         # we must arrange to add it to its RPATH; however, `patchelf' seems

+3 -1

pkgs/development/libraries/SDL2/default.nix

···

       8
       8
        
       , ibusSupport ? false, ibus

     

       9
       9
        
       , pulseaudioSupport ? true, libpulseaudio

     

       10
       10
        
       , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL

     

       11
       11
       +
       , libiconv

     

       11
       12
        
       }:

     

       12
       13
        
       

     

       13
       14
        
       # OSS is no longer supported, for it's much crappier than ALSA and

     
···

       41
       42
        
         # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.

     

       42
       43
        
         propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++

     

       43
       44
        
           lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++

     

       44
       44
       -
           lib.optional pulseaudioSupport libpulseaudio;

     

       45
       45
       +
           lib.optional pulseaudioSupport libpulseaudio

     

       46
       46
       +
           ++ [ libiconv ];

     

       45
       47
        
       

     

       46
       48
        
         buildInputs = [ audiofile ] ++

     

       47
       49
        
           lib.optional openglSupport mesa_noglu ++

+3 -1

pkgs/development/libraries/attr/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, gettext }:

     

       1
       1
       +
       { stdenv, fetchurl, gettext, hostPlatform }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "attr-2.4.47";

     
···

       15
       15
        
         configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ECHO=echo" "SED=sed" "AWK=gawk" ];

     

       16
       16
        
       

     

       17
       17
        
         installTargets = [ "install" "install-lib" "install-dev" ];

     

       18
       18
       +
       

     

       19
       19
       +
         patches = if (hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null;

     

       18
       20
        
       

     

       19
       21
        
         meta = with stdenv.lib; {

     

       20
       22
        
           homepage = "http://savannah.nongnu.org/projects/attr/";

+54

pkgs/development/libraries/attr/fix-headers-musl.patch

···

       1
       1
       +
       --- attr-2.4.47/include/xattr.h

     

       2
       2
       +
       +++ attr-2.4.47/include/xattr.h

     

       3
       3
       +
       @@ -31,33 +31,37 @@

     

       4
       4
       +
        #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */

     

       5
       5
       +
        

     

       6
       6
       +
        

     

       7
       7
       +
       -__BEGIN_DECLS

     

       8
       8
       +
       +#ifdef __cplusplus

     

       9
       9
       +
       +extern "C" {

     

       10
       10
       +
       +#endif

     

       11
       11
       +
        

     

       12
       12
       +
        extern int setxattr (const char *__path, const char *__name,

     

       13
       13
       +
       -		      const void *__value, size_t __size, int __flags) __THROW;

     

       14
       14
       +
       +		      const void *__value, size_t __size, int __flags);

     

       15
       15
       +
        extern int lsetxattr (const char *__path, const char *__name,

     

       16
       16
       +
       -		      const void *__value, size_t __size, int __flags) __THROW;

     

       17
       17
       +
       +		      const void *__value, size_t __size, int __flags);

     

       18
       18
       +
        extern int fsetxattr (int __filedes, const char *__name,

     

       19
       19
       +
       -		      const void *__value, size_t __size, int __flags) __THROW;

     

       20
       20
       +
       +		      const void *__value, size_t __size, int __flags);

     

       21
       21
       +
        

     

       22
       22
       +
        extern ssize_t getxattr (const char *__path, const char *__name,

     

       23
       23
       +
       -				void *__value, size_t __size) __THROW;

     

       24
       24
       +
       +				void *__value, size_t __size);

     

       25
       25
       +
        extern ssize_t lgetxattr (const char *__path, const char *__name,

     

       26
       26
       +
       -				void *__value, size_t __size) __THROW;

     

       27
       27
       +
       +				void *__value, size_t __size);

     

       28
       28
       +
        extern ssize_t fgetxattr (int __filedes, const char *__name,

     

       29
       29
       +
       -				void *__value, size_t __size) __THROW;

     

       30
       30
       +
       +				void *__value, size_t __size);

     

       31
       31
       +
        

     

       32
       32
       +
        extern ssize_t listxattr (const char *__path, char *__list,

     

       33
       33
       +
       -				size_t __size) __THROW;

     

       34
       34
       +
       +				size_t __size);

     

       35
       35
       +
        extern ssize_t llistxattr (const char *__path, char *__list,

     

       36
       36
       +
       -				size_t __size) __THROW;

     

       37
       37
       +
       +				size_t __size);

     

       38
       38
       +
        extern ssize_t flistxattr (int __filedes, char *__list,

     

       39
       39
       +
       -				size_t __size) __THROW;

     

       40
       40
       +
       +				size_t __size);

     

       41
       41
       +
        

     

       42
       42
       +
       -extern int removexattr (const char *__path, const char *__name) __THROW;

     

       43
       43
       +
       -extern int lremovexattr (const char *__path, const char *__name) __THROW;

     

       44
       44
       +
       -extern int fremovexattr (int __filedes,   const char *__name) __THROW;

     

       45
       45
       +
       +extern int removexattr (const char *__path, const char *__name);

     

       46
       46
       +
       +extern int lremovexattr (const char *__path, const char *__name);

     

       47
       47
       +
       +extern int fremovexattr (int __filedes,   const char *__name);

     

       48
       48
       +
        

     

       49
       49
       +
       -__END_DECLS

     

       50
       50
       +
       +#ifdef __cplusplus

     

       51
       51
       +
       +}

     

       52
       52
       +
       +#endif

     

       53
       53
       +
        

     

       54
       54
       +
        #endif	/* __XATTR_H__ */

+1

pkgs/development/libraries/aws-sdk-cpp/default.nix

···

       33
       33
        
       

     

       34
       34
        
         cmakeFlags =

     

       35
       35
        
           lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"

     

       36
       36
       +
           ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF"

     

       36
       37
        
           ++ lib.optional (apis != ["*"])

     

       37
       38
        
             "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";

     

       38
       39

+12 -2

pkgs/development/libraries/boehm-gc/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops, enableLargeConfig ? false

     

       2
       2
        
       , buildPlatform, hostPlatform

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       20
       20
        
         outputs = [ "out" "dev" "doc" ];

     

       21
       21
        
         separateDebugInfo = stdenv.isLinux;

     

       22
       22
        
       

     

       23
       23
       +
         preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''

     

       24
       24
       +
           export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         patches = [ (fetchpatch {

     

       28
       28
       +
           url = "https://raw.githubusercontent.com/gentoo/musl/85b6a600996bdd71162b357e9ba93d8559342432/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch";

     

       29
       29
       +
           sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";

     

       30
       30
       +
         }) ];

     

       31
       31
       +
       

     

       23
       32
        
         configureFlags =

     

       24
       33
        
           [ "--enable-cplusplus" ]

     

       25
       25
       -
           ++ lib.optional enableLargeConfig "--enable-large-config";

     

       34
       34
       +
           ++ lib.optional enableLargeConfig "--enable-large-config"

     

       35
       35
       +
           ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";

     

       26
       36
        
       

     

       27
       37
        
         doCheck = true; # not cross;

     

       28
       38

+1 -1

pkgs/development/libraries/fftw/default.nix

···

       29
       29
        
           # all x86_64 have sse2

     

       30
       30
        
           # however, not all float sizes fit

     

       31
       31
        
           ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") )  "--enable-sse2"

     

       32
       32
       -
           ++ optional stdenv.cc.isGNU "--enable-openmp"

     

       32
       32
       +
           ++ optional (stdenv.cc.isGNU && !stdenv.hostPlatform.isMusl) "--enable-openmp"

     

       33
       33
        
           # doc generation causes Fortran wrapper generation which hard-codes gcc

     

       34
       34
        
           ++ optional (!withDoc) "--disable-doc";

     

       35
       35

+7 -2

pkgs/development/libraries/gamin/default.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation (rec {

     

       4
       4
        
         name = "gamin-0.1.10";

     
···

       18
       18
        
       

     

       19
       19
        
         patches = [ ./deadlock.patch ]

     

       20
       20
        
           ++ map fetchurl (import ./debian-patches.nix)

     

       21
       21
       -
           ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch;

     

       21
       21
       +
           ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch

     

       22
       22
       +
           ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {

     

       23
       23
       +
             name = "fix-pthread-mutex.patch";

     

       24
       24
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";

     

       25
       25
       +
             sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";

     

       26
       26
       +
           });

     

       22
       27
        
       

     

       23
       28
        
       

     

       24
       29
        
         meta = with stdenv.lib; {

+1 -1

pkgs/development/libraries/glibc/common.nix

···

       222
       222
        
       

     

       223
       223
        
         # To avoid a dependency on the build system 'bash'.

     

       224
       224
        
         preFixup = ''

     

       225
       225
       -
           rm $bin/bin/{ldd,tzselect,catchsegv,xtrace}

     

       225
       225
       +
           rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace}

     

       226
       226
        
         '';

     

       227
       227
        
       })

+2 -2

pkgs/development/libraries/glibc/locales.nix

···

       6
       6
        
          https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED

     

       7
       7
        
       */

     

       8
       8
        
       

     

       9
       9
       -
       { stdenv, callPackage, writeText

     

       9
       9
       +
       { stdenv, buildPackages, callPackage, writeText

     

       10
       10
        
       , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ]

     

       11
       11
        
       }:

     

       12
       12
        
       

     
···

       26
       26
        
         # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.

     

       27
       27
        
         buildPhase =

     

       28
       28
        
           ''

     

       29
       29
       -
             mkdir -p $TMPDIR/"${stdenv.cc.libc.out}/lib/locale"

     

       29
       29
       +
             mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale"

     

       30
       30
        
       

     

       31
       31
        
             # Hack to allow building of the locales (needed since glibc-2.12)

     

       32
       32
        
             sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile

+1 -1

pkgs/development/libraries/icu/base.nix

···

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
        
         # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27

     

       29
       29
       -
         postPatch = if stdenv ? glibc

     

       29
       29
       +
         postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl")

     

       30
       30
        
           then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'"

     

       31
       31
        
           else null; # won't find locale_t on darwin

     

       32
       32

+13 -1

pkgs/development/libraries/libbfd/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
       -
       , fetchurl, autoreconfHook264, bison, binutils-raw

     

       2
       2
       +
       , fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw

     

       3
       3
        
       , libiberty, zlib

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       11
       11
        
       

     

       12
       12
        
         patches = binutils-raw.bintools.patches ++ [

     

       13
       13
        
           ../../tools/misc/binutils/build-components-separately.patch

     

       14
       14
       +
           (fetchpatch {

     

       15
       15
       +
             url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch";

     

       16
       16
       +
             sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q";

     

       17
       17
       +
           })

     

       14
       18
        
         ];

     

       15
       19
        
       

     

       16
       20
        
         # We just want to build libbfd

     

       17
       21
        
         postPatch = ''

     

       18
       22
        
           cd bfd

     

       19
       23
        
         '';

     

       24
       24
       +
       

     

       25
       25
       +
         postAutoreconf = ''

     

       26
       26
       +
           echo "Updating config.guess and config.sub from ${gnu-config}"

     

       27
       27
       +
           cp -f ${gnu-config}/config.{guess,sub} ../

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         # We update these ourselves

     

       31
       31
       +
         dontUpdateAutotoolsGnuConfigScripts = true;

     

       20
       32
        
       

     

       21
       33
        
         nativeBuildInputs = [ autoreconfHook264 bison ];

     

       22
       34
        
         buildInputs = [ libiberty zlib ];

+4 -3

pkgs/development/libraries/libclc/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, python2, llvmPackages }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, python, llvmPackages }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         llvm = llvmPackages.llvm;

     
···

       15
       15
        
           sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ python2 llvm clang ];

     

       18
       18
       +
         nativeBuildInputs = [ python ];

     

       19
       19
       +
         buildInputs = [ llvm clang ];

     

       19
       20
        
       

     

       20
       21
        
         postPatch = ''

     

       21
       22
        
           sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py

     
···

       23
       24
        
         '';

     

       24
       25
        
       

     

       25
       26
        
         configurePhase = ''

     

       26
       26
       -
           ${python2.interpreter} ./configure.py --prefix=$out

     

       27
       27
       +
           ${python.interpreter} ./configure.py --prefix=$out

     

       27
       28
        
         '';

     

       28
       29
        
       

     

       29
       30
        
         meta = with stdenv.lib; {

+6 -2

pkgs/development/libraries/libdaemon/default.nix

···

       1
       1
        
       {stdenv, fetchurl}:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       3
       3
       +
       stdenv.mkDerivation (rec {

     

       4
       4
        
         name = "libdaemon-0.14";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     
···

       24
       24
        
           platforms = stdenv.lib.platforms.unix;

     

       25
       25
        
           maintainers = [ ];

     

       26
       26
        
         };

     

       27
       27
       -
       }

     

       27
       27
       +
       } // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl {

     

       28
       28
       +
         # This patch should be applied unconditionally, but doing so will cause mass rebuild.

     

       29
       29
       +
         patches = ./fix-includes.patch;

     

       30
       30
       +
       })

     

       31
       31
       +

+13

pkgs/development/libraries/libdaemon/fix-includes.patch

···

       1
       1
       +
       --- libdaemon-0.14.orig/examples/testd.c

     

       2
       2
       +
       +++ libdaemon-0.14/examples/testd.c

     

       3
       3
       +
       @@ -21,9 +21,9 @@

     

       4
       4
       +
        #include <signal.h>

     

       5
       5
       +
        #include <errno.h>

     

       6
       6
       +
        #include <string.h>

     

       7
       7
       +
       +#include <unistd.h>

     

       8
       8
       +
        #include <sys/types.h>

     

       9
       9
       +
        #include <sys/time.h>

     

       10
       10
       +
       -#include <sys/unistd.h>

     

       11
       11
       +
        #include <sys/select.h>

     

       12
       12
       +
        

     

       13
       13
       +
        #include <libdaemon/dfork.h>

+46

pkgs/development/libraries/libexecinfo/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, fetchpatch }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "libexecinfo-${version}";

     

       5
       5
       +
         version = "1.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2";

     

       9
       9
       +
           sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         patches = [

     

       13
       13
       +
           (fetchpatch {

     

       14
       14
       +
             name = "10-execinfo.patch";

     

       15
       15
       +
             url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1;

     

       16
       16
       +
             sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g";

     

       17
       17
       +
           })

     

       18
       18
       +
           (fetchpatch {

     

       19
       19
       +
             name = "20-define-gnu-source.patch";

     

       20
       20
       +
             url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1;

     

       21
       21
       +
             sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302";

     

       22
       22
       +
           })

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             name = "30-linux-makefile.patch";

     

       25
       25
       +
             url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1;

     

       26
       26
       +
             sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf";

     

       27
       27
       +
           })

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ];

     

       31
       31
       +
       

     

       32
       32
       +
         patchFlags = "-p0";

     

       33
       33
       +
       

     

       34
       34
       +
         installPhase = ''

     

       35
       35
       +
           install -Dm644 execinfo.h stacktraverse.h -t $out/include

     

       36
       36
       +
           install -Dm755 libexecinfo.{a,so.1} -t $out/lib

     

       37
       37
       +
           ln -s $out/lib/libexecinfo.so{.1,}

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       40
       40
       +
         meta = with stdenv.lib; {

     

       41
       41
       +
           description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility";

     

       42
       42
       +
           license = licenses.bsd2;

     

       43
       43
       +
           homepage = https://www.freshports.org/devel/libexecinfo;

     

       44
       44
       +
           maintainers = with maintainers; [ dtzWill ];

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+21 -4

pkgs/development/libraries/libffi/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, dejagnu, doCheck ? false

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch,  dejagnu, doCheck ? false

     

       2
       2
        
       , buildPlatform, hostPlatform

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       10
       10
        
           sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch ++

     

       14
       14
       -
           stdenv.lib.optional stdenv.isAarch64 (fetchurl {

     

       13
       13
       +
         patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch

     

       14
       14
       +
           ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {

     

       15
       15
        
             url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch;

     

       16
       16
        
             sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc";

     

       17
       17
       -
           });

     

       17
       17
       +
           })

     

       18
       18
       +
           ++ stdenv.lib.optional hostPlatform.isMusl (fetchpatch {

     

       19
       19
       +
             name = "gnu-linux-define.patch";

     

       20
       20
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580";

     

       21
       21
       +
             sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2";

     

       22
       22
       +
           })

     

       23
       23
       +
           ++ stdenv.lib.optionals stdenv.isMips [

     

       24
       24
       +
             (fetchpatch {

     

       25
       25
       +
               name = "0001-mips-Use-compiler-internal-define-for-linux.patch";

     

       26
       26
       +
               url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000";

     

       27
       27
       +
               sha256 = "1gc53lw90p6hc0cmhj3csrwincfz7va5ss995ksw5gm0yrr9mrvb";

     

       28
       28
       +
             })

     

       29
       29
       +
             (fetchpatch {

     

       30
       30
       +
               name = "0001-mips-fix-MIPS-softfloat-build-issue.patch";

     

       31
       31
       +
               url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000";

     

       32
       32
       +
               sha256 = "0l8xgdciqalg4z9rcwyk87h8fdxpfv4hfqxwsy2agpnpszl5jjdq";

     

       33
       33
       +
             })

     

       34
       34
       +
           ];

     

       18
       35
        
       

     

       19
       36
        
         outputs = [ "out" "dev" "man" "info" ];

     

       20
       37

+5 -1

pkgs/development/libraries/libgpg-error/default.nix

···

       9
       9
        
           sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";

     

       12
       12
       +
         postPatch = ''

     

       13
       13
       +
           sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure

     

       14
       14
       +
         '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

     

       15
       15
       +
           ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h

     

       16
       16
       +
         '';

     

       13
       17
        
       

     

       14
       18
        
         outputs = [ "out" "dev" "info" ];

     

       15
       19
        
         outputBin = "dev"; # deps want just the lib, most likely

+1 -1

pkgs/development/libraries/libiconv/default.nix

···

       2
       2
        
       , buildPlatform, hostPlatform

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross

     

       5
       5
       +
       # assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

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

+1 -1

pkgs/development/libraries/libidn/default.nix

···

       10
       10
        
       

     

       11
       11
        
         outputs = [ "bin" "dev" "out" "info" "devdoc" ];

     

       12
       12
        
       

     

       13
       13
       -
         doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin;

     

       13
       13
       +
         doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl;

     

       14
       14
        
       

     

       15
       15
        
         hardeningDisable = [ "format" ];

     

       16
       16

+2 -1

pkgs/development/libraries/libmemcached/default.nix

···

       17
       17
        
           ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {

     

       18
       18
        
             url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb";

     

       19
       19
        
             sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8";

     

       20
       20
       -
           });

     

       20
       20
       +
           })

     

       21
       21
       +
           ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch;

     

       21
       22
        
       

     

       22
       23
        
         buildInputs = [ libevent ];

     

       23
       24
        
         propagatedBuildInputs = [ cyrus_sasl ];

+58

pkgs/development/libraries/libmemcached/musl-fixes.patch

···

       1
       1
       +
       diff --git a/libhashkit/fnv_64.cc b/libhashkit/fnv_64.cc

     

       2
       2
       +
       index 68e4dd0..64656b7 100644

     

       3
       3
       +
       --- a/libhashkit/fnv_64.cc

     

       4
       4
       +
       +++ b/libhashkit/fnv_64.cc

     

       5
       5
       +
       @@ -37,8 +37,9 @@

     

       6
       6
       +
        

     

       7
       7
       +
        

     

       8
       8
       +
        #include <libhashkit/common.h>

     

       9
       9
       +
       +#include <limits.h>

     

       10
       10
       +
        

     

       11
       11
       +
       -#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH)

     

       12
       12
       +
       +#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH)

     

       13
       13
       +
        

     

       14
       14
       +
        /* FNV hash'es lifted from Dustin Sallings work */

     

       15
       15
       +
        static uint64_t FNV_64_INIT= 0xcbf29ce484222325;

     

       16
       16
       +
       diff --git a/libhashkit/has.cc b/libhashkit/has.cc

     

       17
       17
       +
       index 843e32e..4153e5e 100644

     

       18
       18
       +
       --- a/libhashkit/has.cc

     

       19
       19
       +
       +++ b/libhashkit/has.cc

     

       20
       20
       +
       @@ -37,6 +37,7 @@

     

       21
       21
       +
        

     

       22
       22
       +
        

     

       23
       23
       +
        #include <libhashkit/common.h>

     

       24
       24
       +
       +#include <limits.h>

     

       25
       25
       +
        

     

       26
       26
       +
        bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo)

     

       27
       27
       +
        {

     

       28
       28
       +
       @@ -44,7 +45,7 @@ bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo)

     

       29
       29
       +
          {

     

       30
       30
       +
          case HASHKIT_HASH_FNV1_64:

     

       31
       31
       +
          case HASHKIT_HASH_FNV1A_64:

     

       32
       32
       +
       -#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH)

     

       33
       33
       +
       +#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH)

     

       34
       34
       +
            return true;

     

       35
       35
       +
        #else

     

       36
       36
       +
            return false;

     

       37
       37
       +
       diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc

     

       38
       38
       +
       index 29a22de..161c646 100644

     

       39
       39
       +
       --- a/libtest/cmdline.cc

     

       40
       40
       +
       +++ b/libtest/cmdline.cc

     

       41
       41
       +
       @@ -61,7 +61,7 @@ using namespace libtest;

     

       42
       42
       +
        #include <algorithm>

     

       43
       43
       +
        #include <stdexcept>

     

       44
       44
       +
        

     

       45
       45
       +
       -#ifndef __USE_GNU

     

       46
       46
       +
       +#ifndef _GNU_SOURCE

     

       47
       47
       +
        static char **environ= NULL;

     

       48
       48
       +
        #endif

     

       49
       49
       +
        

     

       50
       50
       +
       @@ -201,7 +201,7 @@ Application::error_t Application::run(const char *args[])

     

       51
       51
       +
        

     

       52
       52
       +
          fatal_assert(posix_spawnattr_setsigmask(&spawnattr, &mask) == 0);

     

       53
       53
       +
        

     

       54
       54
       +
       -#if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__)

     

       55
       55
       +
       +#if defined(POSIX_SPAWN_USEVFORK) || defined(__GLIBC__)

     

       56
       56
       +
          // Use USEVFORK on linux

     

       57
       57
       +
          flags |= POSIX_SPAWN_USEVFORK;

     

       58
       58
       +
        #endif

+3 -6

pkgs/development/libraries/libmpc/default.nix

···

       1
       1
        
       { stdenv, fetchurl

     

       2
       2
        
       , gmp, mpfr

     

       3
       3
       -
       , buildPlatform, hostPlatform

     

       4
       3
        
       }:

     

       5
       4
        
       

     

       6
       5
        
       let

     

       7
       7
       -
         version = "1.0.3";

     

       6
       6
       +
         version = "1.1.0";

     

       8
       7
        
       in

     

       9
       8
        
       stdenv.mkDerivation rec {

     

       10
       9
        
         name = "libmpc-${version}"; # to avoid clash with the MPD client

     

       11
       10
        
       

     

       12
       11
        
         src = fetchurl {

     

       13
       13
       -
           url = "https://ftp.gnu.org/gnu/mpc/mpc-${version}.tar.gz";

     

       14
       14
       -
           sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1";

     

       12
       12
       +
           url = "mirror://gnu/mpc/mpc-${version}.tar.gz";

     

       13
       13
       +
           sha256 = "0biwnhjm3rx3hc0rfpvyniky4lpzsvdcwhmcn7f0h4iw2hwcb1b9";

     

       15
       14
        
         };

     

       16
       15
        
       

     

       17
       16
        
         buildInputs = [ gmp mpfr ];

     

       18
       18
       -
       

     

       19
       19
       -
         CFLAGS = "-I${gmp.dev}/include";

     

       20
       17
        
       

     

       21
       18
        
         doCheck = true; # not cross;

     

       22
       19

+2

pkgs/development/libraries/libnet/default.nix

···

       9
       9
        
           sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         patches = [ ./fix-includes.patch ];

     

       13
       13
       +
       

     

       12
       14
        
         meta = with stdenv.lib; {

     

       13
       15
        
           homepage = https://github.com/sam-github/libnet;

     

       14
       16
        
           description = "Portable framework for low-level network packet construction";

+29

pkgs/development/libraries/libnet/fix-includes.patch

···

       1
       1
       +
       --- libnet-1.1.6.orig/src/libnet_link_linux.c

     

       2
       2
       +
       +++ libnet-1.1.6/src/libnet_link_linux.c

     

       3
       3
       +
       @@ -30,26 +30,15 @@

     

       4
       4
       +
        #include <sys/time.h>

     

       5
       5
       +
        

     

       6
       6
       +
        #include <net/if.h>

     

       7
       7
       +
       -#if (__GLIBC__)

     

       8
       8
       +
        #include <netinet/if_ether.h>

     

       9
       9
       +
        #include <net/if_arp.h>

     

       10
       10
       +
       -#else

     

       11
       11
       +
       -#include <linux/if_arp.h>

     

       12
       12
       +
       -#include <linux/if_ether.h>

     

       13
       13
       +
       -#endif

     

       14
       14
       +
        

     

       15
       15
       +
        #if (HAVE_PACKET_SOCKET)

     

       16
       16
       +
        #ifndef SOL_PACKET

     

       17
       17
       +
        #define SOL_PACKET 263

     

       18
       18
       +
        #endif  /* SOL_PACKET */

     

       19
       19
       +
       -#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1

     

       20
       20
       +
        #include <netpacket/packet.h>

     

       21
       21
       +
        #include <net/ethernet.h>     /* the L2 protocols */

     

       22
       22
       +
       -#else

     

       23
       23
       +
       -#include <asm/types.h>

     

       24
       24
       +
       -#include <linux/if_packet.h>

     

       25
       25
       +
       -#include <linux/if_ether.h>   /* The L2 protocols */

     

       26
       26
       +
       -#endif

     

       27
       27
       +
        #endif  /* HAVE_PACKET_SOCKET */

     

       28
       28
       +
        

     

       29
       29
       +
        #include "../include/libnet.h"

+499

pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch

···

       1
       1
       +
       From patchwork Fri Apr  3 22:04:46 2015

     

       2
       2
       +
       Content-Type: text/plain; charset="utf-8"

     

       3
       3
       +
       MIME-Version: 1.0

     

       4
       4
       +
       Content-Transfer-Encoding: 7bit

     

       5
       5
       +
       Subject: Use stdlib uint* instead of u_int*

     

       6
       6
       +
       From: Nathan McSween <nwmcsween@gmail.com>

     

       7
       7
       +
       X-Patchwork-Id: 458131

     

       8
       8
       +
       X-Patchwork-Delegate: pablo@netfilter.org

     

       9
       9
       +
       Message-Id: <1428098686-17843-1-git-send-email-nwmcsween@gmail.com>

     

       10
       10
       +
       To: netfilter-devel@vger.kernel.org

     

       11
       11
       +
       Cc: Nathan McSween <nwmcsween@gmail.com>

     

       12
       12
       +
       Date: Fri,  3 Apr 2015 22:04:46 +0000

     

       13
       13
       +
       

     

       14
       14
       +
       Signed-off-by: Nathan McSween <nwmcsween@gmail.com>

     

       15
       15
       +
       ---

     

       16
       16
       +
        include/libnfnetlink/libnfnetlink.h           | 25 +++++-----

     

       17
       17
       +
        include/libnfnetlink/linux_nfnetlink.h        | 11 +++--

     

       18
       18
       +
        include/libnfnetlink/linux_nfnetlink_compat.h |  6 ++-

     

       19
       19
       +
        src/iftable.c                                 |  9 ++--

     

       20
       20
       +
        src/iftable.h                                 |  6 ++-

     

       21
       21
       +
        src/libnfnetlink.c                            | 71 ++++++++++++++-------------

     

       22
       22
       +
        src/rtnl.c                                    |  5 +-

     

       23
       23
       +
        src/rtnl.h                                    |  3 +-

     

       24
       24
       +
        8 files changed, 73 insertions(+), 63 deletions(-)

     

       25
       25
       +
       

     

       26
       26
       +
       diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h

     

       27
       27
       +
       index 1d8c49d..cd0be3d 100644

     

       28
       28
       +
       --- a/include/libnfnetlink/libnfnetlink.h

     

       29
       29
       +
       +++ b/include/libnfnetlink/libnfnetlink.h

     

       30
       30
       +
       @@ -15,6 +15,7 @@

     

       31
       31
       +
        #define aligned_u64 unsigned long long __attribute__((aligned(8)))

     

       32
       32
       +
        #endif

     

       33
       33
       +
        

     

       34
       34
       +
       +#include <stdint.h>

     

       35
       35
       +
        #include <sys/socket.h>	/* for sa_family_t */

     

       36
       36
       +
        #include <linux/netlink.h>

     

       37
       37
       +
        #include <libnfnetlink/linux_nfnetlink.h>

     

       38
       38
       +
       @@ -55,7 +56,7 @@ struct nfnlhdr {

     

       39
       39
       +
        struct nfnl_callback {

     

       40
       40
       +
        	int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data);

     

       41
       41
       +
        	void *data;

     

       42
       42
       +
       -	u_int16_t attr_count;

     

       43
       43
       +
       +	uint16_t attr_count;

     

       44
       44
       +
        };

     

       45
       45
       +
        

     

       46
       46
       +
        struct nfnl_handle;

     

       47
       47
       +
       @@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void);

     

       48
       48
       +
        extern int nfnl_close(struct nfnl_handle *);

     

       49
       49
       +
        

     

       50
       50
       +
        extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, 

     

       51
       51
       +
       -						   u_int8_t, u_int8_t, 

     

       52
       52
       +
       +						   uint8_t, uint8_t,

     

       53
       53
       +
        						   unsigned int);

     

       54
       54
       +
        extern void nfnl_subsys_close(struct nfnl_subsys_handle *);

     

       55
       55
       +
        

     

       56
       56
       +
       @@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh,

     

       57
       57
       +
        			const struct iovec *iov, unsigned int num,

     

       58
       58
       +
        			unsigned int flags);

     

       59
       59
       +
        extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *,

     

       60
       60
       +
       -			  unsigned int, u_int8_t, u_int16_t, u_int16_t,

     

       61
       61
       +
       -			  u_int16_t);

     

       62
       62
       +
       +			  unsigned int, uint8_t, uint16_t, uint16_t,

     

       63
       63
       +
       +			  uint16_t);

     

       64
       64
       +
        extern __attribute__((deprecated)) int

     

       65
       65
       +
        nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t,

     

       66
       66
       +
                  unsigned, struct nlmsghdr *,

     

       67
       67
       +
       @@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *,

     

       68
       68
       +
        /* receiving */

     

       69
       69
       +
        extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len);

     

       70
       70
       +
        extern int nfnl_callback_register(struct nfnl_subsys_handle *,

     

       71
       71
       +
       -				  u_int8_t type, struct nfnl_callback *cb);

     

       72
       72
       +
       -extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type);

     

       73
       73
       +
       +				  uint8_t type, struct nfnl_callback *cb);

     

       74
       74
       +
       +extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type);

     

       75
       75
       +
        extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len);

     

       76
       76
       +
        

     

       77
       77
       +
        /* parsing */

     

       78
       78
       +
       @@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh);

     

       79
       79
       +
        

     

       80
       80
       +
        /* nfnl attribute handling functions */

     

       81
       81
       +
        extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int);

     

       82
       82
       +
       -extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t);

     

       83
       83
       +
       -extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t);

     

       84
       84
       +
       -extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t);

     

       85
       85
       +
       +extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t);

     

       86
       86
       +
       +extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t);

     

       87
       87
       +
       +extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t);

     

       88
       88
       +
        extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int);

     

       89
       89
       +
       -extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t);

     

       90
       90
       +
       -extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t);

     

       91
       91
       +
       +extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t);

     

       92
       92
       +
       +extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t);

     

       93
       93
       +
        extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int);

     

       94
       94
       +
        #define nfnl_parse_nested(tb, max, nfa) \

     

       95
       95
       +
        	nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))

     

       96
       96
       +
       @@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int);

     

       97
       97
       +
        ({	(tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; })

     

       98
       98
       +
        

     

       99
       99
       +
        extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, 

     

       100
       100
       +
       -				 u_int16_t type, u_int32_t len,

     

       101
       101
       +
       +				 uint16_t type, uint32_t len,

     

       102
       102
       +
        				 unsigned char *val);

     

       103
       103
       +
        extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, 

     

       104
       104
       +
        				   unsigned int size);

     

       105
       105
       +
       diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h

     

       106
       106
       +
       index 76a8550..7b843c6 100644

     

       107
       107
       +
       --- a/include/libnfnetlink/linux_nfnetlink.h

     

       108
       108
       +
       +++ b/include/libnfnetlink/linux_nfnetlink.h

     

       109
       109
       +
       @@ -1,5 +1,6 @@

     

       110
       110
       +
        #ifndef _NFNETLINK_H

     

       111
       111
       +
        #define _NFNETLINK_H

     

       112
       112
       +
       +#include <stdint.h>

     

       113
       113
       +
        #include <linux/types.h>

     

       114
       114
       +
        #include <libnfnetlink/linux_nfnetlink_compat.h>

     

       115
       115
       +
        

     

       116
       116
       +
       @@ -25,9 +26,9 @@ enum nfnetlink_groups {

     

       117
       117
       +
        /* General form of address family dependent message.

     

       118
       118
       +
         */

     

       119
       119
       +
        struct nfgenmsg {

     

       120
       120
       +
       -	u_int8_t  nfgen_family;		/* AF_xxx */

     

       121
       121
       +
       -	u_int8_t  version;		/* nfnetlink version */

     

       122
       122
       +
       -	u_int16_t    res_id;		/* resource id */

     

       123
       123
       +
       +	uint8_t  nfgen_family;		/* AF_xxx */

     

       124
       124
       +
       +	uint8_t  version;		/* nfnetlink version */

     

       125
       125
       +
       +	uint16_t    res_id;		/* resource id */

     

       126
       126
       +
        };

     

       127
       127
       +
        

     

       128
       128
       +
        #define NFNETLINK_V0	0

     

       129
       129
       +
       @@ -59,7 +60,7 @@ struct nfnl_callback

     

       130
       130
       +
        	int (*call)(struct sock *nl, struct sk_buff *skb, 

     

       131
       131
       +
        		struct nlmsghdr *nlh, struct nlattr *cda[]);

     

       132
       132
       +
        	const struct nla_policy *policy;	/* netlink attribute policy */

     

       133
       133
       +
       -	const u_int16_t attr_count;		/* number of nlattr's */

     

       134
       134
       +
       +	const uint16_t attr_count;		/* number of nlattr's */

     

       135
       135
       +
        };

     

       136
       136
       +
        

     

       137
       137
       +
        struct nfnetlink_subsystem

     

       138
       138
       +
       @@ -76,7 +77,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);

     

       139
       139
       +
        extern int nfnetlink_has_listeners(unsigned int group);

     

       140
       140
       +
        extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, 

     

       141
       141
       +
        			  int echo);

     

       142
       142
       +
       -extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);

     

       143
       143
       +
       +extern int nfnetlink_unicast(struct sk_buff *skb, uint32_t pid, int flags);

     

       144
       144
       +
        

     

       145
       145
       +
        #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \

     

       146
       146
       +
        	MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))

     

       147
       147
       +
       diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h

     

       148
       148
       +
       index e145176..cd094fc 100644

     

       149
       149
       +
       --- a/include/libnfnetlink/linux_nfnetlink_compat.h

     

       150
       150
       +
       +++ b/include/libnfnetlink/linux_nfnetlink_compat.h

     

       151
       151
       +
       @@ -3,6 +3,8 @@

     

       152
       152
       +
        #ifndef __KERNEL__

     

       153
       153
       +
        /* Old nfnetlink macros for userspace */

     

       154
       154
       +
        

     

       155
       155
       +
       +#include <stdint.h>

     

       156
       156
       +
       +

     

       157
       157
       +
        /* nfnetlink groups: Up to 32 maximum */

     

       158
       158
       +
        #define NF_NETLINK_CONNTRACK_NEW 		0x00000001

     

       159
       159
       +
        #define NF_NETLINK_CONNTRACK_UPDATE		0x00000002

     

       160
       160
       +
       @@ -20,8 +22,8 @@

     

       161
       161
       +
        

     

       162
       162
       +
        struct nfattr

     

       163
       163
       +
        {

     

       164
       164
       +
       -	u_int16_t nfa_len;

     

       165
       165
       +
       -	u_int16_t nfa_type;	/* we use 15 bits for the type, and the highest

     

       166
       166
       +
       +	uint16_t nfa_len;

     

       167
       167
       +
       +	uint16_t nfa_type;	/* we use 15 bits for the type, and the highest

     

       168
       168
       +
        				 * bit to indicate whether the payload is nested */

     

       169
       169
       +
        };

     

       170
       170
       +
        

     

       171
       171
       +
       diff --git a/src/iftable.c b/src/iftable.c

     

       172
       172
       +
       index 5976ed8..3411c4c 100644

     

       173
       173
       +
       --- a/src/iftable.c

     

       174
       174
       +
       +++ b/src/iftable.c

     

       175
       175
       +
       @@ -9,6 +9,7 @@

     

       176
       176
       +
        /* IFINDEX handling */

     

       177
       177
       +
        

     

       178
       178
       +
        #include <unistd.h>

     

       179
       179
       +
       +#include <stdint.h>

     

       180
       180
       +
        #include <stdlib.h>

     

       181
       181
       +
        #include <stdio.h>

     

       182
       182
       +
        #include <string.h>

     

       183
       183
       +
       @@ -27,10 +28,10 @@

     

       184
       184
       +
        struct ifindex_node {

     

       185
       185
       +
        	struct list_head head;

     

       186
       186
       +
        

     

       187
       187
       +
       -	u_int32_t	index;

     

       188
       188
       +
       -	u_int32_t	type;

     

       189
       189
       +
       -	u_int32_t	alen;

     

       190
       190
       +
       -	u_int32_t	flags;

     

       191
       191
       +
       +	uint32_t	index;

     

       192
       192
       +
       +	uint32_t	type;

     

       193
       193
       +
       +	uint32_t	alen;

     

       194
       194
       +
       +	uint32_t	flags;

     

       195
       195
       +
        	char		addr[8];

     

       196
       196
       +
        	char		name[16];

     

       197
       197
       +
        };

     

       198
       198
       +
       diff --git a/src/iftable.h b/src/iftable.h

     

       199
       199
       +
       index 8df7f24..0cc5335 100644

     

       200
       200
       +
       --- a/src/iftable.h

     

       201
       201
       +
       +++ b/src/iftable.h

     

       202
       202
       +
       @@ -1,8 +1,10 @@

     

       203
       203
       +
        #ifndef _IFTABLE_H

     

       204
       204
       +
        #define _IFTABLE_H

     

       205
       205
       +
        

     

       206
       206
       +
       -int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif);

     

       207
       207
       +
       -int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif);

     

       208
       208
       +
       +#include <stdint.h>

     

       209
       209
       +
       +

     

       210
       210
       +
       +int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif);

     

       211
       211
       +
       +int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif);

     

       212
       212
       +
        

     

       213
       213
       +
        int iftable_init(void);

     

       214
       214
       +
        void iftable_fini(void);

     

       215
       215
       +
       diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c

     

       216
       216
       +
       index 398b7d7..b8958dc 100644

     

       217
       217
       +
       --- a/src/libnfnetlink.c

     

       218
       218
       +
       +++ b/src/libnfnetlink.c

     

       219
       219
       +
       @@ -36,6 +36,7 @@

     

       220
       220
       +
         * 	minor cleanups

     

       221
       221
       +
         */

     

       222
       222
       +
        

     

       223
       223
       +
       +#include <stdint.h>

     

       224
       224
       +
        #include <stdlib.h>

     

       225
       225
       +
        #include <stdio.h>

     

       226
       226
       +
        #include <unistd.h>

     

       227
       227
       +
       @@ -72,9 +73,9 @@

     

       228
       228
       +
        

     

       229
       229
       +
        struct nfnl_subsys_handle {

     

       230
       230
       +
        	struct nfnl_handle 	*nfnlh;

     

       231
       231
       +
       -	u_int32_t		subscriptions;

     

       232
       232
       +
       -	u_int8_t		subsys_id;

     

       233
       233
       +
       -	u_int8_t		cb_count;

     

       234
       234
       +
       +	uint32_t		subscriptions;

     

       235
       235
       +
       +	uint8_t		subsys_id;

     

       236
       236
       +
       +	uint8_t		cb_count;

     

       237
       237
       +
        	struct nfnl_callback 	*cb;	/* array of callbacks */

     

       238
       238
       +
        };

     

       239
       239
       +
        

     

       240
       240
       +
       @@ -86,11 +87,11 @@ struct nfnl_handle {

     

       241
       241
       +
        	int			fd;

     

       242
       242
       +
        	struct sockaddr_nl	local;

     

       243
       243
       +
        	struct sockaddr_nl	peer;

     

       244
       244
       +
       -	u_int32_t		subscriptions;

     

       245
       245
       +
       -	u_int32_t		seq;

     

       246
       246
       +
       -	u_int32_t		dump;

     

       247
       247
       +
       -	u_int32_t		rcv_buffer_size;	/* for nfnl_catch */

     

       248
       248
       +
       -	u_int32_t		flags;

     

       249
       249
       +
       +	uint32_t		subscriptions;

     

       250
       250
       +
       +	uint32_t		seq;

     

       251
       251
       +
       +	uint32_t		dump;

     

       252
       252
       +
       +	uint32_t		rcv_buffer_size;	/* for nfnl_catch */

     

       253
       253
       +
       +	uint32_t		flags;

     

       254
       254
       +
        	struct nlmsghdr 	*last_nlhdr;

     

       255
       255
       +
        	struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1];

     

       256
       256
       +
        };

     

       257
       257
       +
       @@ -145,7 +146,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h)

     

       258
       258
       +
        static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh)

     

       259
       259
       +
        {

     

       260
       260
       +
        	int i, err;

     

       261
       261
       +
       -	u_int32_t new_subscriptions = nfnlh->subscriptions;

     

       262
       262
       +
       +	uint32_t new_subscriptions = nfnlh->subscriptions;

     

       263
       263
       +
        

     

       264
       264
       +
        	for (i = 0; i < NFNL_MAX_SUBSYS; i++)

     

       265
       265
       +
        		new_subscriptions |= nfnlh->subsys[i].subscriptions;

     

       266
       266
       +
       @@ -273,8 +274,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size)

     

       267
       267
       +
         * a valid address that points to a nfnl_subsys_handle structure is returned.

     

       268
       268
       +
         */

     

       269
       269
       +
        struct nfnl_subsys_handle *

     

       270
       270
       +
       -nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id,

     

       271
       271
       +
       -		 u_int8_t cb_count, u_int32_t subscriptions)

     

       272
       272
       +
       +nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id,

     

       273
       273
       +
       +		 uint8_t cb_count, uint32_t subscriptions)

     

       274
       274
       +
        {

     

       275
       275
       +
        	struct nfnl_subsys_handle *ssh;

     

       276
       276
       +
        

     

       277
       277
       +
       @@ -435,10 +436,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov,

     

       278
       278
       +
         */

     

       279
       279
       +
        void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh,

     

       280
       280
       +
        		    struct nlmsghdr *nlh, unsigned int len, 

     

       281
       281
       +
       -		    u_int8_t family,

     

       282
       282
       +
       -		    u_int16_t res_id,

     

       283
       283
       +
       -		    u_int16_t msg_type,

     

       284
       284
       +
       -		    u_int16_t msg_flags)

     

       285
       285
       +
       +		    uint8_t family,

     

       286
       286
       +
       +		    uint16_t res_id,

     

       287
       287
       +
       +		    uint16_t msg_type,

     

       288
       288
       +
       +		    uint16_t msg_flags)

     

       289
       289
       +
        {

     

       290
       290
       +
        	assert(ssh);

     

       291
       291
       +
        	assert(nlh);

     

       292
       292
       +
       @@ -849,14 +850,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type,

     

       293
       293
       +
        }

     

       294
       294
       +
        

     

       295
       295
       +
        /**

     

       296
       296
       +
       - * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr

     

       297
       297
       +
       + * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr

     

       298
       298
       +
         *

     

       299
       299
       +
         * @n: netlink message header to which attribute is to be added

     

       300
       300
       +
         * @maxlen: maximum length of netlink message header

     

       301
       301
       +
         * @type: type of new attribute

     

       302
       302
       +
         * @data: content of new attribute

     

       303
       303
       +
         */

     

       304
       304
       +
       -int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data)

     

       305
       305
       +
       +int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data)

     

       306
       306
       +
        {

     

       307
       307
       +
        	assert(n);

     

       308
       308
       +
        	assert(maxlen > 0);

     

       309
       309
       +
       @@ -866,7 +867,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data)

     

       310
       310
       +
        }

     

       311
       311
       +
        

     

       312
       312
       +
        /**

     

       313
       313
       +
       - * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr 

     

       314
       314
       +
       + * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr

     

       315
       315
       +
         *

     

       316
       316
       +
         * @nfa: struct nfattr

     

       317
       317
       +
         * @maxlen: maximal length of nfattr buffer

     

       318
       318
       +
       @@ -875,7 +876,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data)

     

       319
       319
       +
         *

     

       320
       320
       +
         */

     

       321
       321
       +
        int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, 

     

       322
       322
       +
       -		       u_int16_t data)

     

       323
       323
       +
       +		       uint16_t data)

     

       324
       324
       +
        {

     

       325
       325
       +
        	assert(nfa);

     

       326
       326
       +
        	assert(maxlen > 0);

     

       327
       327
       +
       @@ -885,7 +886,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type,

     

       328
       328
       +
        }

     

       329
       329
       +
        

     

       330
       330
       +
        /**

     

       331
       331
       +
       - * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr

     

       332
       332
       +
       + * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr

     

       333
       333
       +
         *

     

       334
       334
       +
         * @n: netlink message header to which attribute is to be added

     

       335
       335
       +
         * @maxlen: maximum length of netlink message header

     

       336
       336
       +
       @@ -894,7 +895,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type,

     

       337
       337
       +
         *

     

       338
       338
       +
         */

     

       339
       339
       +
        int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type,

     

       340
       340
       +
       -		   u_int16_t data)

     

       341
       341
       +
       +		   uint16_t data)

     

       342
       342
       +
        {

     

       343
       343
       +
        	assert(n);

     

       344
       344
       +
        	assert(maxlen > 0);

     

       345
       345
       +
       @@ -904,7 +905,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type,

     

       346
       346
       +
        }

     

       347
       347
       +
        

     

       348
       348
       +
        /**

     

       349
       349
       +
       - * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr 

     

       350
       350
       +
       + * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr

     

       351
       351
       +
         *

     

       352
       352
       +
         * @nfa: struct nfattr

     

       353
       353
       +
         * @maxlen: maximal length of nfattr buffer

     

       354
       354
       +
       @@ -913,7 +914,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type,

     

       355
       355
       +
         *

     

       356
       356
       +
         */

     

       357
       357
       +
        int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, 

     

       358
       358
       +
       -		       u_int32_t data)

     

       359
       359
       +
       +		       uint32_t data)

     

       360
       360
       +
        {

     

       361
       361
       +
        	assert(nfa);

     

       362
       362
       +
        	assert(maxlen > 0);

     

       363
       363
       +
       @@ -923,7 +924,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type,

     

       364
       364
       +
        }

     

       365
       365
       +
        

     

       366
       366
       +
        /**

     

       367
       367
       +
       - * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr

     

       368
       368
       +
       + * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr

     

       369
       369
       +
         *

     

       370
       370
       +
         * @n: netlink message header to which attribute is to be added

     

       371
       371
       +
         * @maxlen: maximum length of netlink message header

     

       372
       372
       +
       @@ -932,7 +933,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type,

     

       373
       373
       +
         *

     

       374
       374
       +
         */

     

       375
       375
       +
        int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type,

     

       376
       376
       +
       -		   u_int32_t data)

     

       377
       377
       +
       +		   uint32_t data)

     

       378
       378
       +
        {

     

       379
       379
       +
        	assert(n);

     

       380
       380
       +
        	assert(maxlen > 0);

     

       381
       381
       +
       @@ -980,7 +981,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len)

     

       382
       382
       +
         *

     

       383
       383
       +
         */ 

     

       384
       384
       +
        void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, 

     

       385
       385
       +
       -			  u_int16_t type, u_int32_t len, unsigned char *val)

     

       386
       386
       +
       +			  uint16_t type, uint32_t len, unsigned char *val)

     

       387
       387
       +
        {

     

       388
       388
       +
        	assert(iov);

     

       389
       389
       +
        	assert(nfa);

     

       390
       390
       +
       @@ -1115,7 +1116,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h,

     

       391
       391
       +
         * appropiately.

     

       392
       392
       +
         */

     

       393
       393
       +
        int nfnl_callback_register(struct nfnl_subsys_handle *ssh,

     

       394
       394
       +
       -			   u_int8_t type, struct nfnl_callback *cb)

     

       395
       395
       +
       +			   uint8_t type, struct nfnl_callback *cb)

     

       396
       396
       +
        {

     

       397
       397
       +
        	assert(ssh);

     

       398
       398
       +
        	assert(cb);

     

       399
       399
       +
       @@ -1138,7 +1139,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh,

     

       400
       400
       +
         * On sucess, 0 is returned. On error, -1 is returned and errno is

     

       401
       401
       +
         * set appropiately.

     

       402
       402
       +
         */

     

       403
       403
       +
       -int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type)

     

       404
       404
       +
       +int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type)

     

       405
       405
       +
        {

     

       406
       406
       +
        	assert(ssh);

     

       407
       407
       +
        

     

       408
       408
       +
       @@ -1161,8 +1162,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h,

     

       409
       409
       +
        	assert(nfa);

     

       410
       410
       +
        

     

       411
       411
       +
        	int min_len;

     

       412
       412
       +
       -	u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);

     

       413
       413
       +
       -	u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);

     

       414
       414
       +
       +	uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);

     

       415
       415
       +
       +	uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);

     

       416
       416
       +
        	const struct nfnl_subsys_handle *ssh;

     

       417
       417
       +
        	struct nfnl_callback *cb;

     

       418
       418
       +
        

     

       419
       419
       +
       @@ -1212,8 +1213,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh,

     

       420
       420
       +
        			     int len)

     

       421
       421
       +
        {

     

       422
       422
       +
        	struct nfnl_subsys_handle *ssh;

     

       423
       423
       +
       -	u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);

     

       424
       424
       +
       -	u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);

     

       425
       425
       +
       +	uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);

     

       426
       426
       +
       +	uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);

     

       427
       427
       +
        	int err = 0;

     

       428
       428
       +
        

     

       429
       429
       +
        	if (subsys_id > NFNL_MAX_SUBSYS)

     

       430
       430
       +
       @@ -1243,7 +1244,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len)

     

       431
       431
       +
        {

     

       432
       432
       +
        

     

       433
       433
       +
        	while (len >= NLMSG_SPACE(0)) {

     

       434
       434
       +
       -		u_int32_t rlen;

     

       435
       435
       +
       +		uint32_t rlen;

     

       436
       436
       +
        		struct nlmsghdr *nlh = (struct nlmsghdr *)buf;

     

       437
       437
       +
        

     

       438
       438
       +
        		if (nlh->nlmsg_len < sizeof(struct nlmsghdr)

     

       439
       439
       +
       @@ -1285,8 +1286,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh)

     

       440
       440
       +
        static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh)

     

       441
       441
       +
        {

     

       442
       442
       +
        	struct nfnl_subsys_handle *ssh;

     

       443
       443
       +
       -	u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);

     

       444
       444
       +
       -	u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);

     

       445
       445
       +
       +	uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);

     

       446
       446
       +
       +	uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);

     

       447
       447
       +
        

     

       448
       448
       +
        	/* Is this an error message? */

     

       449
       449
       +
        	if (nfnl_is_error(h, nlh)) {

     

       450
       450
       +
       diff --git a/src/rtnl.c b/src/rtnl.c

     

       451
       451
       +
       index 7b4ac7d..34802fe 100644

     

       452
       452
       +
       --- a/src/rtnl.c

     

       453
       453
       +
       +++ b/src/rtnl.c

     

       454
       454
       +
       @@ -11,6 +11,7 @@

     

       455
       455
       +
        /* rtnetlink - routing table netlink interface */

     

       456
       456
       +
        

     

       457
       457
       +
        #include <unistd.h>

     

       458
       458
       +
       +#include <stdint.h>

     

       459
       459
       +
        #include <stdlib.h>

     

       460
       460
       +
        #include <string.h>

     

       461
       461
       +
        #include <errno.h>

     

       462
       462
       +
       @@ -30,7 +31,7 @@

     

       463
       463
       +
        #define rtnl_log(x, ...)

     

       464
       464
       +
        

     

       465
       465
       +
        static inline struct rtnl_handler *

     

       466
       466
       +
       -find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type)

     

       467
       467
       +
       +find_handler(struct rtnl_handle *rtnl_handle, uint16_t type)

     

       468
       468
       +
        {

     

       469
       469
       +
        	struct rtnl_handler *h;

     

       470
       470
       +
        	for (h = rtnl_handle->handlers; h; h = h->next) {

     

       471
       471
       +
       @@ -41,7 +42,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type)

     

       472
       472
       +
        }

     

       473
       473
       +
        

     

       474
       474
       +
        static int call_handler(struct rtnl_handle *rtnl_handle,

     

       475
       475
       +
       -			u_int16_t type,

     

       476
       476
       +
       +			uint16_t type,

     

       477
       477
       +
        			struct nlmsghdr *hdr)

     

       478
       478
       +
        {

     

       479
       479
       +
        	struct rtnl_handler *h = find_handler(rtnl_handle, type);

     

       480
       480
       +
       diff --git a/src/rtnl.h b/src/rtnl.h

     

       481
       481
       +
       index 0c403dc..9858ae5 100644

     

       482
       482
       +
       --- a/src/rtnl.h

     

       483
       483
       +
       +++ b/src/rtnl.h

     

       484
       484
       +
       @@ -1,13 +1,14 @@

     

       485
       485
       +
        #ifndef _RTNL_H

     

       486
       486
       +
        #define _RTNL_H

     

       487
       487
       +
        

     

       488
       488
       +
       +#include <stdint.h>

     

       489
       489
       +
        #include <linux/types.h>

     

       490
       490
       +
        #include <linux/rtnetlink.h>

     

       491
       491
       +
        

     

       492
       492
       +
        struct rtnl_handler {

     

       493
       493
       +
        	struct rtnl_handler *next;

     

       494
       494
       +
        

     

       495
       495
       +
       -	u_int16_t	nlmsg_type;

     

       496
       496
       +
       +	uint16_t	nlmsg_type;

     

       497
       497
       +
        	int		(*handlefn)(struct nlmsghdr *h, void *arg);

     

       498
       498
       +
        	void		*arg;

     

       499
       499
       +
        };

+4

pkgs/development/libraries/libnfnetlink/default.nix

···

       8
       8
        
           sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       +
         patches = [

     

       12
       12
       +
           ./Use-stdlib-uint-instead-of-u_int.patch

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       11
       15
        
         meta = {

     

       12
       16
        
           description = "Low-level library for netfilter related kernel/userspace communication";

     

       13
       17
        
           longDescription = ''

+30

pkgs/development/libraries/libnsl/cdefs.patch

···

       1
       1
       +
       --- a/src/rpcsvc/nislib.h

     

       2
       2
       +
       +++ b/src/rpcsvc/nislib.h

     

       3
       3
       +
       @@ -19,6 +19,7 @@

     

       4
       4
       +
        #ifndef	__RPCSVC_NISLIB_H__

     

       5
       5
       +
        #define	__RPCSVC_NISLIB_H__

     

       6
       6
       +
        

     

       7
       7
       +
       +#include <sys/cdefs.h>

     

       8
       8
       +
        #include <features.h>

     

       9
       9
       +
        

     

       10
       10
       +
        __BEGIN_DECLS

     

       11
       11
       +
       --- a/src/rpcsvc/ypclnt.h

     

       12
       12
       +
       +++ b/src/rpcsvc/ypclnt.h

     

       13
       13
       +
       @@ -20,6 +20,7 @@

     

       14
       14
       +
        #ifndef	__RPCSVC_YPCLNT_H__

     

       15
       15
       +
        #define	__RPCSVC_YPCLNT_H__

     

       16
       16
       +
        

     

       17
       17
       +
       +#include <sys/cdefs.h>

     

       18
       18
       +
        #include <features.h>

     

       19
       19
       +
        

     

       20
       20
       +
        /* Some defines */

     

       21
       21
       +
       --- a/src/rpcsvc/ypupd.h

     

       22
       22
       +
       +++ b/src/rpcsvc/ypupd.h

     

       23
       23
       +
       @@ -33,6 +33,7 @@

     

       24
       24
       +
        #ifndef __RPCSVC_YPUPD_H__

     

       25
       25
       +
        #define __RPCSVC_YPUPD_H__

     

       26
       26
       +
        

     

       27
       27
       +
       +#include <sys/cdefs.h>

     

       28
       28
       +
        #include <features.h>

     

       29
       29
       +
        

     

       30
       30
       +
        #include <rpc/rpc.h>

+2

pkgs/development/libraries/libnsl/default.nix

···

       14
       14
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       15
       15
        
         buildInputs = [ libtirpc ];

     

       16
       16
        
       

     

       17
       17
       +
         patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ./cdefs.patch ./nis_h.patch ];

     

       18
       18
       +
       

     

       17
       19
        
         meta = with stdenv.lib; {

     

       18
       20
        
           description = "Client interface library for NIS(YP) and NIS+";

     

       19
       21
        
           homepage = https://github.com/thkukuk/libnsl;

+45

pkgs/development/libraries/libnsl/nis_h.patch

···

       1
       1
       +
       --- a/src/rpcsvc/nis.h

     

       2
       2
       +
       +++ b/src/rpcsvc/nis.h

     

       3
       3
       +
       @@ -32,6 +32,7 @@

     

       4
       4
       +
        #ifndef _RPCSVC_NIS_H

     

       5
       5
       +
        #define _RPCSVC_NIS_H 1

     

       6
       6
       +
        

     

       7
       7
       +
       +#include <sys/cdefs.h>

     

       8
       8
       +
        #include <features.h>

     

       9
       9
       +
        #include <rpc/rpc.h>

     

       10
       10
       +
        #include <rpcsvc/nis_tags.h>

     

       11
       11
       +
       @@ -56,6 +57,34 @@

     

       12
       12
       +
         *                                              <kukuk@suse.de>

     

       13
       13
       +
         */

     

       14
       14
       +
        

     

       15
       15
       +
       +#ifndef rawmemchr

     

       16
       16
       +
       +#define rawmemchr(s,c) memchr((s),(size_t)-1,(c))

     

       17
       17
       +
       +#endif

     

       18
       18
       +
       +

     

       19
       19
       +
       +#ifndef __asprintf

     

       20
       20
       +
       +#define __asprintf asprintf

     

       21
       21
       +
       +#endif

     

       22
       22
       +
       +

     

       23
       23
       +
       +#ifndef __mempcpy

     

       24
       24
       +
       +#define __mempcpy mempcpy

     

       25
       25
       +
       +#endif

     

       26
       26
       +
       +

     

       27
       27
       +
       +#ifndef __strtok_r

     

       28
       28
       +
       +#define __strtok_r strtok_r

     

       29
       29
       +
       +#endif

     

       30
       30
       +
       +

     

       31
       31
       +
       +#ifndef __always_inline

     

       32
       32
       +
       +#define __always_inline __attribute__((__always_inline__))

     

       33
       33
       +
       +#endif

     

       34
       34
       +
       +

     

       35
       35
       +
       +#ifndef TEMP_FAILURE_RETRY

     

       36
       36
       +
       +#define TEMP_FAILURE_RETRY(exp) ({ \

     

       37
       37
       +
       +typeof (exp) _rc; \

     

       38
       38
       +
       + do { \

     

       39
       39
       +
       +  _rc = (exp); \

     

       40
       40
       +
       + } while (_rc == -1 && errno == EINTR); \

     

       41
       41
       +
       + _rc; })

     

       42
       42
       +
       +#endif

     

       43
       43
       +
        

     

       44
       44
       +
        #ifndef __nis_object_h

     

       45
       45
       +
        #define __nis_object_h

+1 -1

pkgs/development/libraries/libunistring/default.nix

···

       17
       17
        
           "--with-libiconv-prefix=${libiconv}"

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
       -
         doCheck = true;

     

       20
       20
       +
         doCheck = !stdenv.hostPlatform.isMusl;

     

       21
       21
        
       

     

       22
       22
        
         enableParallelBuilding = true;

     

       23
       23

+45

pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch

···

       1
       1
       +
       From 04437142399662b576bd55a85485c6dcc14d0812 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Khem Raj <raj.khem at gmail.com>

     

       3
       3
       +
       Date: Thu, 31 Dec 2015 06:44:07 +0000

     

       4
       4
       +
       Subject: [PATCH] backtrace: Use only with glibc and uclibc

     

       5
       5
       +
       

     

       6
       6
       +
       backtrace API is glibc specific not linux specific

     

       7
       7
       +
       so make it behave so.

     

       8
       8
       +
       

     

       9
       9
       +
       Signed-off-by: Khem Raj <raj.khem at gmail.com>

     

       10
       10
       +
       ---

     

       11
       11
       +
       Upstream-Status: Pending

     

       12
       12
       +
       

     

       13
       13
       +
        tests/test-coredump-unwind.c | 4 +++-

     

       14
       14
       +
        1 file changed, 3 insertions(+), 1 deletion(-)

     

       15
       15
       +
       

     

       16
       16
       +
       diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c

     

       17
       17
       +
       index 5254708..8767b42 100644

     

       18
       18
       +
       --- a/tests/test-coredump-unwind.c

     

       19
       19
       +
       +++ b/tests/test-coredump-unwind.c

     

       20
       20
       +
       @@ -57,7 +57,9 @@

     

       21
       21
       +
        #include <grp.h>

     

       22
       22
       +
        

     

       23
       23
       +
        /* For SIGSEGV handler code */

     

       24
       24
       +
       +#ifdef __GLIBC__

     

       25
       25
       +
        #include <execinfo.h>

     

       26
       26
       +
       +#endif

     

       27
       27
       +
        #include <sys/ucontext.h>

     

       28
       28
       +
        

     

       29
       29
       +
        #include <libunwind-coredump.h>

     

       30
       30
       +
       @@ -238,11 +240,11 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext)

     

       31
       31
       +
        			ip);

     

       32
       32
       +
        

     

       33
       33
       +
          {

     

       34
       34
       +
       +#ifdef __GLIBC__

     

       35
       35
       +
            /* glibc extension */

     

       36
       36
       +
            void *array[50];

     

       37
       37
       +
            int size;

     

       38
       38
       +
            size = backtrace(array, 50);

     

       39
       39
       +
       -#ifdef __linux__

     

       40
       40
       +
            backtrace_symbols_fd(array, size, 2);

     

       41
       41
       +
        #endif

     

       42
       42
       +
          }

     

       43
       43
       +
       -- 

     

       44
       44
       +
       2.6.4

     

       45
       45
       +

+1

pkgs/development/libraries/libunwind/default.nix

···

       11
       11
        
       

     

       12
       12
        
         patches = [

     

       13
       13
        
           ./version-1.2.1.patch

     

       14
       14
       +
           ./backtrace-only-with-glibc.patch

     

       14
       15
        
         ];

     

       15
       16
        
       

     

       16
       17
        
         nativeBuildInputs = [ autoreconfHook ];

+2

pkgs/development/libraries/libusb/default.nix

···

       14
       14
        
           sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       +
         patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;

     

       18
       18
       +
       

     

       17
       19
        
         meta = {

     

       18
       20
        
           platforms = stdenv.lib.platforms.unix;

     

       19
       21
        
         };

+10

pkgs/development/libraries/libusb/fix-headers.patch

···

       1
       1
       +
       --- libusb-compat-0.1.5.orig/libusb/usb.h

     

       2
       2
       +
       +++ libusb-compat-0.1.5/libusb/usb.h

     

       3
       3
       +
       @@ -25,6 +25,7 @@

     

       4
       4
       +
        #ifndef __USB_H__

     

       5
       5
       +
        #define __USB_H__

     

       6
       6
       +
        

     

       7
       7
       +
       +#include <sys/types.h>

     

       8
       8
       +
        #include <unistd.h>

     

       9
       9
       +
        #include <stdlib.h>

     

       10
       10
       +
        #include <limits.h>

+2 -1

pkgs/development/libraries/libxml2/default.nix

···

       36
       36
        
       

     

       37
       37
        
         enableParallelBuilding = true;

     

       38
       38
        
       

     

       39
       39
       -
         doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin;

     

       39
       39
       +
         doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin &&

     

       40
       40
       +
           hostPlatform.libc != "musl";

     

       40
       41
        
       

     

       41
       42
        
         crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") {

     

       42
       43
        
           # creating the DLL is broken ATM

+1 -1

pkgs/development/libraries/mesa/default.nix

···

       92
       92
        
         patches = [

     

       93
       93
        
           ./glx_ro_text_segm.patch # fix for grsecurity/PaX

     

       94
       94
        
           ./symlink-drivers.patch

     

       95
       95
       -
         ];

     

       95
       95
       +
         ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch;

     

       96
       96
        
       

     

       97
       97
        
         outputs = [ "out" "dev" "drivers" "osmesa" ];

     

       98
       98

+22

pkgs/development/libraries/mesa/musl-fixes.patch

···

       1
       1
       +
       --- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig

     

       2
       2
       +
       +++ ./src/gallium/winsys/svga/drm/vmw_screen.h

     

       3
       3
       +
       @@ -34,7 +34,7 @@

     

       4
       4
       +
        #ifndef VMW_SCREEN_H_

     

       5
       5
       +
        #define VMW_SCREEN_H_

     

       6
       6
       +
        

     

       7
       7
       +
       -

     

       8
       8
       +
       +#include <sys/stat.h>

     

       9
       9
       +
        #include "pipe/p_compiler.h"

     

       10
       10
       +
        #include "pipe/p_state.h"

     

       11
       11
       +
        

     

       12
       12
       +
       --- a/src/util/u_endian.h.orig	2016-11-04 12:16:00.480356454 +0100

     

       13
       13
       +
       +++ b/src/util/u_endian.h	2016-11-04 12:16:11.984347944 +0100

     

       14
       14
       +
       @@ -27,7 +27,7 @@

     

       15
       15
       +
        #ifndef U_ENDIAN_H

     

       16
       16
       +
        #define U_ENDIAN_H

     

       17
       17
       +
        

     

       18
       18
       +
       -#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__)

     

       19
       19
       +
       +#if defined(__linux__) || defined(ANDROID) || defined(__CYGWIN__)

     

       20
       20
       +
        #include <endian.h>

     

       21
       21
       +
        

     

       22
       22
       +
        #if __BYTE_ORDER == __LITTLE_ENDIAN

+4 -6

pkgs/development/libraries/mpfr/default.nix

···

       1
       1
        
       { stdenv, fetchurl, gmp

     

       2
       2
       -
       , buildPlatform, hostPlatform

     

       2
       2
       +
       , hostPlatform

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "mpfr-3.1.3";

     

       6
       6
       +
         name = "mpfr-3.1.6";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://gnu/mpfr/${name}.tar.bz2";

     

       10
       10
       -
           sha256 = "1z8akfw9wbmq91vrx04bw86mmnxw2sw5qm5cr8ix5b3w2mcv8fzn";

     

       9
       9
       +
           url = "mirror://gnu/mpfr/${name}.tar.xz";

     

       10
       10
       +
           sha256 = "0l598h9klpgkz2bp0rxiqb90mkqh9f2f81n5rpy191j00hdaqqks";

     

       11
       11
        
         };

     

       12
       12
       -
       

     

       13
       13
       -
         patches = [ ./upstream.patch ];

     

       14
       12
        
       

     

       15
       13
        
         outputs = [ "out" "dev" "doc" "info" ];

     

       16
       14

+3 -2

pkgs/development/libraries/nettle/generic.nix

···

       1
       1
       -
       { stdenv, gmp, gnum4

     

       1
       1
       +
       { stdenv, buildPackages, gmp, gnum4

     

       2
       2
        
       

     

       3
       3
        
       # Version specific args

     

       4
       4
        
       , version, src

     
···

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

     

       13
       13
        
         outputBin = "dev";

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ gnum4 ];

     

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

     

       16
       16
       +
         nativeBuildInputs = [ gnum4 ];

     

       16
       17
        
         propagatedBuildInputs = [ gmp ];

     

       17
       18
        
       

     

       18
       19
        
         doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin);

+2

pkgs/development/libraries/npth/default.nix

···

       8
       8
        
           sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       +
         doCheck = true;

     

       12
       12
       +
       

     

       11
       13
        
         meta = with stdenv.lib; {

     

       12
       14
        
           description = "The New GNU Portable Threads Library";

     

       13
       15
        
           longDescription = ''

+10

pkgs/development/libraries/openssl/default.nix

···

       24
       24
        
             ++ optional (versionOlder version "1.0.2" && hostPlatform.isDarwin)

     

       25
       25
        
                  ./darwin-arch.patch;

     

       26
       26
        
       

     

       27
       27
       +
         postPatch = if (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) then ''

     

       28
       28
       +
           substituteInPlace crypto/async/arch/async_posix.h \

     

       29
       29
       +
             --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \

     

       30
       30
       +
                       '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'

     

       31
       31
       +
         '' else null;

     

       32
       32
       +
       

     

       27
       33
        
           outputs = [ "bin" "dev" "out" "man" ];

     

       28
       34
        
           setOutputFlags = false;

     

       29
       35
        
           separateDebugInfo = hostPlatform.isLinux;

     
···

       48
       54
        
       

     

       49
       55
        
           # TODO(@Ericson2314): Make unconditional on mass rebuild

     

       50
       56
        
           ${if buildPlatform != hostPlatform then "configurePlatforms" else null} = [];

     

       57
       57
       +
       

     

       58
       58
       +
           preConfigure = ''

     

       59
       59
       +
             patchShebangs Configure

     

       60
       60
       +
           '';

     

       51
       61
        
       

     

       52
       62
        
           configureFlags = [

     

       53
       63
        
             "shared"

+13 -4

pkgs/development/libraries/pixman/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, libpng, glib /*just passthru*/ }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "pixman-0.34.0";

     

       4
       4
       +
         name = "pixman-${version}";

     

       5
       5
       +
         version = "0.34.0";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       8
        
           url = "mirror://xorg/individual/lib/${name}.tar.bz2";

     

       8
       9
        
           sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir";

     

       9
       10
        
         };

     

       10
       11
        
       

     

       11
       11
       -
         patches = [];

     

       12
       12
       +
         patches = stdenv.lib.optionals stdenv.cc.isClang [

     

       13
       13
       +
           (fetchpatch {

     

       14
       14
       +
             name = "builtin-shuffle.patch";

     

       15
       15
       +
             url = https://patchwork.freedesktop.org/patch/177506/raw;

     

       16
       16
       +
             sha256 = "0rvraq93769dy2im2m022rz99fcdxprgc2fbmasnddcwrqy1x3xr";

     

       17
       17
       +
           })

     

       18
       18
       +
         ];

     

       12
       19
        
       

     

       13
       13
       -
         nativeBuildInputs = [ pkgconfig ];

     

       20
       20
       +
         nativeBuildInputs = [ pkgconfig ]

     

       21
       21
       +
           ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool ];

     

       22
       22
       +
       

     

       14
       23
        
         buildInputs = stdenv.lib.optional doCheck libpng;

     

       15
       24
        
       

     

       16
       25
        
         configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt";

+9 -1

pkgs/development/libraries/polkit/default.nix

···

       37
       37
        
             url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";

     

       38
       38
        
             sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh";

     

       39
       39
        
           })

     

       40
       40
       -
         ];

     

       40
       40
       +
         ]

     

       41
       41
       +
         # Could be applied uncondtionally but don't want to trigger rebuild

     

       42
       42
       +
         # https://bugs.freedesktop.org/show_bug.cgi?id=50145

     

       43
       43
       +
         ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {

     

       44
       44
       +
           name = "netgroup-optional.patch";

     

       45
       45
       +
           url = "https://bugs.freedesktop.org/attachment.cgi?id=118753";

     

       46
       46
       +
           sha256 = "1zq51dhmqi9zi86bj9dq4i4pxlxm41k3k4a091j07bd78cjba038";

     

       47
       47
       +
         });

     

       48
       48
       +
       

     

       41
       49
        
       

     

       42
       50
        
         outputs = [ "bin" "dev" "out" ]; # small man pages in $bin

     

       43
       51

+13

pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch

···

       1
       1
       +
       diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm

     

       2
       2
       +
       index 204d685..e05179e 100644

     

       3
       3
       +
       --- a/src/gui/text/qfontengine_coretext.mm

     

       4
       4
       +
       +++ b/src/gui/text/qfontengine_coretext.mm

     

       5
       5
       +
       @@ -886,7 +886,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl

     

       6
       6
       +
        

     

       7
       7
       +
        QFixed QCoreTextFontEngine::emSquareSize() const

     

       8
       8
       +
        {

     

       9
       9
       +
       -    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));

     

       10
       10
       +
       +    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));

     

       11
       11
       +
        }

     

       12
       12
       +
        

     

       13
       13
       +
        QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const

+8 -1

pkgs/development/libraries/qt-4.x/4.8/default.nix

···

       68
       68
        
           [ ./glib-2.32.patch

     

       69
       69
        
             ./libressl.patch

     

       70
       70
        
             ./parallel-configure.patch

     

       71
       71
       +
             ./clang-5-darwin.patch

     

       71
       72
        
             ./qt-4.8.7-unixmake-darwin.patch

     

       72
       73
        
             (substituteAll {

     

       73
       74
        
               src = ./dlopen-absolute-paths.diff;

     
···

       106
       107
        
           ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {

     

       107
       108
        
               url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch";

     

       108
       109
        
               sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl";

     

       109
       109
       -
             });

     

       110
       110
       +
             })

     

       111
       111
       +
           ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [

     

       112
       112
       +
               ./qt-musl.patch

     

       113
       113
       +
               ./qt-musl-iconv-no-bom.patch

     

       114
       114
       +
               ./patch-qthread-stacksize.diff

     

       115
       115
       +
               ./qsettings-recursive-global-mutex.patch

     

       116
       116
       +
             ];

     

       110
       117
        
       

     

       111
       118
        
         preConfigure = ''

     

       112
       119
        
           export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"

+54

pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff

···

       1
       1
       +
       --- a/src/corelib/thread/qthread_unix.cpp.orig	2015-11-23 19:05:40.000000000 +0100

     

       2
       2
       +
       +++ b/src/corelib/thread/qthread_unix.cpp	2015-11-24 11:22:31.000000000 +0100

     

       3
       3
       +
       @@ -79,6 +79,7 @@

     

       4
       4
       +
        #endif

     

       5
       5
       +
        

     

       6
       6
       +
       +#include <sys/resource.h> // getrlimit/setrlimit

     

       7
       7
       +
        #if defined(Q_OS_MAC)

     

       8
       8
       +
        # ifdef qDebug

     

       9
       9
       +
        #   define old_qDebug qDebug

     

       10
       10
       +
        #   undef qDebug

     

       11
       11
       +
       @@ -649,6 +650,43 @@

     

       12
       12
       +
        #endif // QT_HAS_THREAD_PRIORITY_SCHEDULING

     

       13
       13
       +
        

     

       14
       14
       +
        

     

       15
       15
       +
       +    if (d->stackSize == 0) {

     

       16
       16
       +
       +        // Fix the default (too small) stack size for threads on OS X,

     

       17
       17
       +
       +        // which also affects the thread pool.

     

       18
       18
       +
       +        // See also:

     

       19
       19
       +
       +        // https://bugreports.qt.io/browse/QTBUG-2568

     

       20
       20
       +
       +        // This fix can also be found in Chromium:

     

       21
       21
       +
       +        // https://chromium.googlesource.com/chromium/src.git/+/master/base/threading/platform_thread_mac.mm#186

     

       22
       22
       +
       +

     

       23
       23
       +
       +        // The Mac OS X default for a pthread stack size is 512kB.

     

       24
       24
       +
       +        // Libc-594.1.4/pthreads/pthread.c's pthread_attr_init uses

     

       25
       25
       +
       +        // DEFAULT_STACK_SIZE for this purpose.

     

       26
       26
       +
       +        //

     

       27
       27
       +
       +        // 512kB isn't quite generous enough for some deeply recursive threads that

     

       28
       28
       +
       +        // otherwise request the default stack size by specifying 0. Here, adopt

     

       29
       29
       +
       +        // glibc's behavior as on Linux, which is to use the current stack size

     

       30
       30
       +
       +        // limit (ulimit -s) as the default stack size. See

     

       31
       31
       +
       +        // glibc-2.11.1/nptl/nptl-init.c's __pthread_initialize_minimal_internal. To

     

       32
       32
       +
       +        // avoid setting the limit below the Mac OS X default or the minimum usable

     

       33
       33
       +
       +        // stack size, these values are also considered. If any of these values

     

       34
       34
       +
       +        // can't be determined, or if stack size is unlimited (ulimit -s unlimited),

     

       35
       35
       +
       +        // stack_size is left at 0 to get the system default.

     

       36
       36
       +
       +        //

     

       37
       37
       +
       +        // Mac OS X normally only applies ulimit -s to the main thread stack. On

     

       38
       38
       +
       +        // contemporary OS X and Linux systems alike, this value is generally 8MB

     

       39
       39
       +
       +        // or in that neighborhood.

     

       40
       40
       +
       +        size_t default_stack_size = 0;

     

       41
       41
       +
       +        struct rlimit stack_rlimit;

     

       42
       42
       +
       +        if (pthread_attr_getstacksize(&attr, &default_stack_size) == 0 &&

     

       43
       43
       +
       +            getrlimit(RLIMIT_STACK, &stack_rlimit) == 0 &&

     

       44
       44
       +
       +            stack_rlimit.rlim_cur != RLIM_INFINITY) {

     

       45
       45
       +
       +            default_stack_size =

     

       46
       46
       +
       +                    std::max(std::max(default_stack_size,

     

       47
       47
       +
       +                                      static_cast<size_t>(PTHREAD_STACK_MIN)),

     

       48
       48
       +
       +                             static_cast<size_t>(stack_rlimit.rlim_cur));

     

       49
       49
       +
       +        }

     

       50
       50
       +
       +        d->stackSize = default_stack_size;

     

       51
       51
       +
       +    }

     

       52
       52
       +
            if (d->stackSize > 0) {

     

       53
       53
       +
        #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0)

     

       54
       54
       +
                int code = pthread_attr_setstacksize(&attr, d->stackSize);

+17

pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch

···

       1
       1
       +
       Calling qsettings before constructing qapplications causes a dead-lock.

     

       2
       2
       +
       

     

       3
       3
       +
       http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932

     

       4
       4
       +
       http://developer.qt.nokia.com/forums/viewthread/10365

     

       5
       5
       +
       

     

       6
       6
       +
       

     

       7
       7
       +
       --- ./src/corelib/io/qsettings.cpp.orig

     

       8
       8
       +
       +++ ./src/corelib/io/qsettings.cpp

     

       9
       9
       +
       @@ -122,7 +122,7 @@

     

       10
       10
       +
        Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc)

     

       11
       11
       +
        Q_GLOBAL_STATIC(PathHash, pathHashFunc)

     

       12
       12
       +
        Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc)

     

       13
       13
       +
       -Q_GLOBAL_STATIC(QMutex, globalMutex)

     

       14
       14
       +
       +Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive))

     

       15
       15
       +
        static QSettings::Format globalDefaultFormat = QSettings::NativeFormat;

     

       16
       16
       +
        

     

       17
       17
       +
        #ifndef Q_OS_WIN

+11

pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch

···

       1
       1
       +
       --- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig

     

       2
       2
       +
       +++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp

     

       3
       3
       +
       @@ -62,7 +62,7 @@

     

       4
       4
       +
        #elif defined(Q_OS_AIX)

     

       5
       5
       +
        #  define NO_BOM

     

       6
       6
       +
        #  define UTF16 "UCS-2"

     

       7
       7
       +
       -#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)

     

       8
       8
       +
       +#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))

     

       9
       9
       +
        #  define NO_BOM

     

       10
       10
       +
        #  if Q_BYTE_ORDER == Q_BIG_ENDIAN

     

       11
       11
       +
        #    define UTF16 "UTF-16BE"

+14

pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch

···

       1
       1
       +
       --- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig

     

       2
       2
       +
       +++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h

     

       3
       3
       +
       @@ -86,11 +86,7 @@

     

       4
       4
       +
        

     

       5
       5
       +
        #undef QT_SOCKLEN_T

     

       6
       6
       +
        

     

       7
       7
       +
       -#if defined(__GLIBC__) && (__GLIBC__ >= 2)

     

       8
       8
       +
        #define QT_SOCKLEN_T            socklen_t

     

       9
       9
       +
       -#else

     

       10
       10
       +
       -#define QT_SOCKLEN_T            int

     

       11
       11
       +
       -#endif

     

       12
       12
       +
        

     

       13
       13
       +
        #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)

     

       14
       14
       +
        #define QT_SNPRINTF		::snprintf

+13

pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch

···

       1
       1
       +
       diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm

     

       2
       2
       +
       index 66baf16..89794ef 100644

     

       3
       3
       +
       --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm

     

       4
       4
       +
       +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm

     

       5
       5
       +
       @@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl

     

       6
       6
       +
        

     

       7
       7
       +
        QFixed QCoreTextFontEngine::emSquareSize() const

     

       8
       8
       +
        {

     

       9
       9
       +
       -    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));

     

       10
       10
       +
       +    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));

     

       11
       11
       +
        }

     

       12
       12
       +
        

     

       13
       13
       +
        QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const

     

       1
       14
        
       diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm

     

       2
       15
        
       index 341d3bccf2..3368234c26 100644

     

       3
       16
        
       --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm

+13

pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch

···

       1
       1
       +
       diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm

     

       2
       2
       +
       index 66baf16..89794ef 100644

     

       3
       3
       +
       --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm

     

       4
       4
       +
       +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm

     

       5
       5
       +
       @@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl

     

       6
       6
       +
        

     

       7
       7
       +
        QFixed QCoreTextFontEngine::emSquareSize() const

     

       8
       8
       +
        {

     

       9
       9
       +
       -    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));

     

       10
       10
       +
       +    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));

     

       11
       11
       +
        }

     

       12
       12
       +
        

     

       13
       13
       +
        QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const

     

       1
       14
        
       diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm

     

       2
       15
        
       index 341d3bc..3368234 100644

     

       3
       16
        
       --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm

+9 -2

pkgs/development/libraries/science/math/openblas/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, gfortran, perl, which, config, coreutils

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, gfortran, perl, which, config, coreutils

     

       2
       2
        
       # Most packages depending on openblas expect integer width to match

     

       3
       3
        
       # pointer width, but some expect to use 32-bit integers always

     

       4
       4
        
       # (for compatibility with reference BLAS).

     
···

       115
       115
        
             "NUM_THREADS=64"

     

       116
       116
        
             "INTERFACE64=${if blas64 then "1" else "0"}"

     

       117
       117
        
             "NO_STATIC=1"

     

       118
       118
       -
           ]

     

       118
       118
       +
           ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"

     

       119
       119
        
           ++ mapAttrsToList (var: val: var + "=" + val) config;

     

       120
       120
       +
       

     

       121
       121
       +
         patches = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc")

     

       122
       122
       +
           # https://github.com/xianyi/OpenBLAS/pull/1247

     

       123
       123
       +
           (fetchpatch {

     

       124
       124
       +
             url = "https://github.com/xianyi/OpenBLAS/commit/88a35ff457f55e527e0e8a503a0dc61976c1846d.patch";

     

       125
       125
       +
             sha256 = "1a3qrhvl5hp06c53fjqghq4zgf6ls7narm06l0shcvs57hznh09n";

     

       126
       126
       +
           });

     

       120
       127
        
       

     

       121
       128
        
         doCheck = true;

     

       122
       129
        
         checkTarget = "tests";

+2 -1

pkgs/development/libraries/stfl/default.nix

···

       13
       13
        
         buildPhase = ''

     

       14
       14
        
           sed -i s/gcc/cc/g Makefile

     

       15
       15
        
           sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h

     

       16
       16
       +
         '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc != "glibc") ''

     

       17
       17
       +
           sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile

     

       16
       18
        
         '' + ( stdenv.lib.optionalString stdenv.isDarwin ''

     

       17
       17
       -
           sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile

     

       18
       19
        
           sed -i s/-soname/-install_name/ Makefile

     

       19
       20
        
         '' ) + ''

     

       20
       21
        
           make

+2

pkgs/development/libraries/tbb/default.nix

···

       16
       16
        
           optional (stdver != null) "stdver=${stdver}"

     

       17
       17
        
         );

     

       18
       18
        
       

     

       19
       19
       +
         patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;

     

       20
       20
       +
       

     

       19
       21
        
         installPhase = ''

     

       20
       22
        
           mkdir -p $out/{lib,share/doc}

     

       21
       23
        
           cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/

+43

pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch

···

       1
       1
       +
       From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: David Huffman <storedbox+alpine@outlook.com>

     

       3
       3
       +
       Date: Wed, 6 Jan 2016 07:09:30 -0500

     

       4
       4
       +
       Subject: [PATCH] hard-code glibc's definition of struct mallinfo

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++

     

       8
       8
       +
        1 file changed, 20 insertions(+)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h

     

       11
       11
       +
       index 781cadc..e1ea1ae 100644

     

       12
       12
       +
       --- a/src/tbbmalloc/proxy.h

     

       13
       13
       +
       +++ b/src/tbbmalloc/proxy.h

     

       14
       14
       +
       @@ -32,6 +32,26 @@

     

       15
       15
       +
        

     

       16
       16
       +
        #include <stddef.h>

     

       17
       17
       +
        

     

       18
       18
       +
       +// The following definition was taken from /usr/include/malloc.h as provided by

     

       19
       19
       +
       +// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is

     

       20
       20
       +
       +// made available under the GNU Lesser General Public License v2.1 or later.

     

       21
       21
       +
       +// See <https://www.gnu.org/licenses>.

     

       22
       22
       +
       +//

     

       23
       23
       +
       +// Copyright (C) 1996-2014 Free Software Foundation, Inc.

     

       24
       24
       +
       +struct mallinfo

     

       25
       25
       +
       +{

     

       26
       26
       +
       +  int arena;    /* non-mmapped space allocated from system */

     

       27
       27
       +
       +  int ordblks;  /* number of free chunks */

     

       28
       28
       +
       +  int smblks;   /* number of fastbin blocks */

     

       29
       29
       +
       +  int hblks;    /* number of mmapped regions */

     

       30
       30
       +
       +  int hblkhd;   /* space in mmapped regions */

     

       31
       31
       +
       +  int usmblks;  /* maximum total allocated space */

     

       32
       32
       +
       +  int fsmblks;  /* space available in freed fastbin blocks */

     

       33
       33
       +
       +  int uordblks; /* total allocated space */

     

       34
       34
       +
       +  int fordblks; /* total free space */

     

       35
       35
       +
       +  int keepcost; /* top-most, releasable (via malloc_trim) space */

     

       36
       36
       +
       +};

     

       37
       37
       +
       +

     

       38
       38
       +
        extern "C" {

     

       39
       39
       +
            void * scalable_malloc(size_t size);

     

       40
       40
       +
            void * scalable_calloc(size_t nobj, size_t size);

     

       41
       41
       +
       -- 

     

       42
       42
       +
       2.6.2

     

       43
       43
       +

+7 -1

pkgs/development/libraries/ti-rpc/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, autoreconfHook, libkrb5 }:

     

       1
       1
       +
       { fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libtirpc-1.0.2";

     
···

       7
       7
        
           url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";

     

       8
       8
        
           sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j";

     

       9
       9
        
         };

     

       10
       10
       +
       

     

       11
       11
       +
         patches = stdenv.lib.optional stdenv.hostPlatform.isMusl

     

       12
       12
       +
           (fetchpatch {

     

       13
       13
       +
             url = "https://raw.githubusercontent.com/openembedded/openembedded-core/2be873301420ec6ca2c70d899b7c49a7e2b0954d/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch";

     

       14
       14
       +
             sha256 = "1jmbn0j2bnjp0j9z5vzz5xiwyv3kd28w5pixbqsy2lz6q8nii7cf";

     

       15
       15
       +
           });

     

       10
       16
        
       

     

       11
       17
        
         postPatch = ''

     

       12
       18
        
           sed '1i#include <stdint.h>' -i src/xdr_sizeof.c

+2

pkgs/development/libraries/webkitgtk/2.4.nix

···

       53
       53
        
           ./quartz-webcore.patch

     

       54
       54
        
           ./libc++.patch

     

       55
       55
        
           ./plugin-none.patch

     

       56
       56
       +
         ] ++ optionals stdenv.hostPlatform.isMusl [

     

       57
       57
       +
           ./fix-execinfo.patch

     

       56
       58
        
         ];

     

       57
       59
        
       

     

       58
       60
        
         configureFlags = with stdenv.lib; [

+20

pkgs/development/libraries/webkitgtk/fix-execinfo.patch

···

       1
       1
       +
       --- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp

     

       2
       2
       +
       +++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp

     

       3
       3
       +
       @@ -64,7 +64,7 @@

     

       4
       4
       +
        #include <windows.h>

     

       5
       5
       +
        #endif

     

       6
       6
       +
        

     

       7
       7
       +
       -#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))

     

       8
       8
       +
       +#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))

     

       9
       9
       +
        #include <cxxabi.h>

     

       10
       10
       +
        #include <dlfcn.h>

     

       11
       11
       +
        #include <execinfo.h>

     

       12
       12
       +
       @@ -242,7 +242,7 @@

     

       13
       13
       +
        

     

       14
       14
       +
        void WTFGetBacktrace(void** stack, int* size)

     

       15
       15
       +
        {

     

       16
       16
       +
       -#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))

     

       17
       17
       +
       +#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))

     

       18
       18
       +
            *size = backtrace(stack, *size);

     

       19
       19
       +
        #elif OS(WINDOWS) && !OS(WINCE)

     

       20
       20
       +
            // The CaptureStackBackTrace function is available in XP, but it is not defined

+2

pkgs/development/libraries/webrtc-audio-processing/default.nix

···

       12
       12
        
         # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode

     

       13
       13
        
         patchPhase = stdenv.lib.optionalString stdenv.isArm ''

     

       14
       14
        
           substituteInPlace configure --replace 'armv7*|armv8*' 'disabled'

     

       15
       15
       +
         '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

     

       16
       16
       +
           substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1

     

       15
       17
        
         '';

     

       16
       18
        
       

     

       17
       19
        
         meta = with stdenv.lib; {

+1 -2

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

···

       9
       9
        
       , idna-ssl

     

       10
       10
        
       , pytest

     

       11
       11
        
       , gunicorn

     

       12
       12
       -
       , pytest-raisesregexp

     

       13
       12
        
       , pytest-mock

     

       14
       13
        
       }:

     

       15
       14
        
       

     
···

       24
       23
        
       

     

       25
       24
        
         disabled = pythonOlder "3.4";

     

       26
       25
        
       

     

       27
       27
       -
         checkInputs = [ pytest gunicorn pytest-raisesregexp pytest-mock ];

     

       26
       26
       +
         checkInputs = [ pytest gunicorn pytest-mock ];

     

       28
       27
        
       

     

       29
       28
        
         propagatedBuildInputs = [ async-timeout chardet multidict yarl ]

     

       30
       29
        
           ++ lib.optional (pythonOlder "3.7") idna-ssl;

+5 -8

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

···

       1
       1
        
       { lib

     

       2
       2
       -
       , fetchurl

     

       2
       2
       +
       , fetchPypi

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , pytestrunner

     

       5
       5
        
       , pythonOlder

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       let

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
        
         pname = "async-timeout";

     

       10
       10
        
         version = "2.0.0";

     

       11
       11
       -
       in buildPythonPackage rec {

     

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

     

       13
       11
        
       

     

       14
       14
       -
         src = fetchurl {

     

       15
       15
       -
           url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       16
       14
        
           sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566";

     

       17
       15
        
         };

     

       18
       16
        
       

     

       19
       19
       -
         buildInputs = [ pytestrunner ];

     

       20
       17
        
         # Circular dependency on aiohttp

     

       21
       18
        
         doCheck = false;

     

       22
       19
        
       

     
···

       27
       24
        
           homepage = https://github.com/aio-libs/async_timeout/;

     

       28
       25
        
           license = lib.licenses.asl20;

     

       29
       26
        
         };

     

       30
       30
       -
       }
     

       27
       27
       +
       }

+1

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

···

       32
       32
        
         # The tests use -Werror but with python3.6 clang detects some unreachable code.

     

       33
       33
        
         NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];

     

       34
       34
        
       

     

       35
       35
       +
         doCheck = !stdenv.hostPlatform.isMusl; # TODO: Investigate

     

       35
       36
        
         checkPhase = ''

     

       36
       37
        
           py.test

     

       37
       38
        
         '';

+1 -2

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

···

       2
       2
        
       , pytest, pytestrunner, hypothesis }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

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

     

       6
       5
        
         pname = "chardet";

     

       7
       6
        
         version = "3.0.4";

     

       8
       7
        
       

     
···

       11
       10
        
           sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";

     

       12
       11
        
         };

     

       13
       12
        
       

     

       14
       14
       -
         buildInputs = [ pytest pytestrunner hypothesis ];

     

       13
       13
       +
         checkInputs = [ pytest pytestrunner hypothesis ];

     

       15
       14
        
       

     

       16
       15
        
         meta = with stdenv.lib; {

     

       17
       16
        
           homepage = https://github.com/chardet/chardet;

+2 -4

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchPypi

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       -
       , cython

     

       5
       5
       -
       , pytest, psutil, pytestrunner

     

       4
       4
       +
       , pytest, pytestrunner

     

       6
       5
        
       , isPy3k

     

       7
       6
        
       }:

     

       8
       7
        
       

     
···

       15
       14
        
           sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v";

     

       16
       15
        
         };

     

       17
       16
        
       

     

       18
       18
       -
         buildInputs = [ cython ];

     

       19
       19
       -
         checkInputs = [ pytest psutil pytestrunner ];

     

       17
       17
       +
         checkInputs = [ pytest pytestrunner ];

     

       20
       18
        
       

     

       21
       19
        
         disabled = !isPy3k;

     

       22
       20

+8 -11

pkgs/development/python-modules/pytest-xdist/default.nix

···

       1
       1
        
       { stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

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

     

       5
       4
        
         pname = "pytest-xdist";

     

       6
       5
        
         version = "1.22.0";

     

       7
       6
        
       

     
···

       10
       9
        
           sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd";

     

       11
       10
        
         };

     

       12
       11
        
       

     

       13
       13
       -
         buildInputs = [ pytest setuptools_scm pytest-forked];

     

       12
       12
       +
         nativeBuildInputs = [ setuptools_scm ];

     

       13
       13
       +
         buildInputs = [ pytest pytest-forked ];

     

       14
       14
        
         propagatedBuildInputs = [ execnet ];

     

       15
       15
        
       

     

       16
       16
       -
         postPatch = ''

     

       17
       17
       -
           rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py

     

       18
       18
       -
         '';

     

       19
       19
       -
       

     

       20
       16
        
         checkPhase = ''

     

       21
       21
       -
           py.test testing

     

       17
       17
       +
           # Excluded tests access file system

     

       18
       18
       +
           py.test testing -k "not test_distribution_rsyncdirs_example \

     

       19
       19
       +
                           and not test_rsync_popen_with_path \

     

       20
       20
       +
                           and not test_popen_rsync_subdir \

     

       21
       21
       +
                           and not test_init_rsync_roots \

     

       22
       22
       +
                           and not test_rsyncignore"

     

       22
       23
        
         '';

     

       23
       23
       -
       

     

       24
       24
       -
         # Only test on 3.x

     

       25
       25
       -
         # INTERNALERROR> AttributeError: 'NoneType' object has no attribute 'getconsumer'

     

       26
       26
       -
         doCheck = isPy3k;

     

       27
       24
        
       

     

       28
       25
        
         meta = with stdenv.lib; {

     

       29
       26
        
           description = "py.test xdist plugin for distributed testing and loop-on-failing modes";

+5 -12

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

···

       4
       4
        
       , pbr

     

       5
       5
        
       , python_mimeparse

     

       6
       6
        
       , extras

     

       7
       7
       -
       , lxml

     

       8
       7
        
       , unittest2

     

       9
       8
        
       , traceback2

     

       10
       10
       -
       , isPy3k

     

       11
       11
       -
       , fixtures

     

       12
       12
       -
       , pyrsistent

     

       9
       9
       +
       , testscenarios

     

       13
       10
        
       }:

     

       14
       11
        
       

     

       15
       15
       -
       

     

       16
       16
       -
       

     

       17
       12
        
       buildPythonPackage rec {

     

       18
       13
        
         pname = "testtools";

     

       19
       14
        
         version = "2.3.0";

     

       20
       15
        
       

     

       21
       21
       -
         # Python 2 only judging from SyntaxError

     

       22
       22
       -
       #   disabled = isPy3k;

     

       23
       23
       -
       

     

       24
       16
        
         src = fetchPypi {

     

       25
       17
        
           inherit pname version;

     

       26
       18
        
           sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559";

     

       27
       19
        
         };

     

       28
       20
        
       

     

       29
       29
       -
         propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ];

     

       21
       21
       +
         propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ];

     

       30
       22
        
         buildInputs = [ traceback2 ];

     

       31
       23
        
       

     

       32
       32
       -
         # No tests in archive

     

       24
       24
       +
         # testscenarios has a circular dependency on testtools

     

       33
       25
        
         doCheck = false;

     

       26
       26
       +
         checkInputs = [ testscenarios ];

     

       34
       27
        
       

     

       35
       28
        
         # testtools 2.0.0 and up has a circular run-time dependency on futures

     

       36
       29
        
         postPatch = ''

     
···

       42
       35
        
           homepage = https://pypi.python.org/pypi/testtools;

     

       43
       36
        
           license = lib.licenses.mit;

     

       44
       37
        
         };

     

       45
       45
       -
       }
     

       38
       38
       +
       }

+15 -1

pkgs/development/tools/build-managers/cmake/default.nix

···

       83
       83
        
         configureFlags = [ "--docdir=share/doc/${name}" ]

     

       84
       84
        
           ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup

     

       85
       85
        
           ++ optional (useQt4 || withQt5) "--qt-gui"

     

       86
       86
       -
           ++ optionals (!useNcurses) [ "--" "-DBUILD_CursesDialog=OFF" ];

     

       86
       86
       +
           ++ ["--"]

     

       87
       87
       +
           ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]

     

       88
       88
       +
           ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

     

       89
       89
       +
             "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++"

     

       90
       90
       +
             "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc"

     

       91
       91
       +
             "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"

     

       92
       92
       +
             "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"

     

       93
       93
       +
             "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"

     

       94
       94
       +
             # TODO: Why are ar and friends not provided by the bintools wrapper?

     

       95
       95
       +
           ];

     

       87
       96
        
       

     

       88
       97
        
         dontUseCmakeConfigure = true;

     

       89
       98
        
         enableParallelBuilding = true;

     

       99
       99
       +
       

     

       100
       100
       +
         # This isn't an autoconf configure script; triples are passed via

     

       101
       101
       +
         # CMAKE_SYSTEM_NAME, etc.

     

       102
       102
       +
         configurePlatforms = [ ];

     

       103
       103
       +
       

     

       90
       104
        
       

     

       91
       105
        
         meta = with stdenv.lib; {

     

       92
       106
        
           homepage = http://www.cmake.org/;

+9 -1

pkgs/development/tools/build-managers/cmake/setup-hook.sh

···

       33
       33
        
               # By now it supports linux builds only. We should set the proper

     

       34
       34
        
               # CMAKE_SYSTEM_NAME otherwise.

     

       35
       35
        
               # http://www.cmake.org/Wiki/CMake_Cross_Compiling

     

       36
       36
       -
               cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-g++ -DCMAKE_C_COMPILER=$crossConfig-gcc $cmakeFlags"

     

       36
       36
       +
               #

     

       37
       37
       +
               # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and

     

       38
       38
       +
               # strip. Otherwise they are taken to be relative to the source root of

     

       39
       39
       +
               # the package being built.

     

       40
       40
       +
               cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-c++ $cmakeFlags"

     

       41
       41
       +
               cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-cc $cmakeFlags"

     

       42
       42
       +
               cmakeFlags="-DCMAKE_AR=$(command -v $crossConfig-ar) $cmakeFlags"

     

       43
       43
       +
               cmakeFlags="-DCMAKE_RANLIB=$(command -v $crossConfig-ranlib) $cmakeFlags"

     

       44
       44
       +
               cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags"

     

       37
       45
        
           fi

     

       38
       46
        
       

     

       39
       47
        
           # This installs shared libraries with a fully-specified install

+1 -1

pkgs/development/tools/build-managers/gnumake/4.2/default.nix

···

       22
       22
        
           ./pselect.patch

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       -
         nativeBuildInputs = [ pkgconfig ];

     

       25
       25
       +
         nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];

     

       26
       26
        
         buildInputs = stdenv.lib.optionals guileSupport [ guile ];

     

       27
       27
        
       

     

       28
       28
        
         configureFlags = stdenv.lib.optional guileSupport "--with-guile";

+2 -1

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

···

       8
       8
        
           sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ m4 perl ];

     

       11
       11
       +
         nativeBuildInputs = [ m4 perl ];

     

       12
       12
       +
         buildInputs = [ m4 ];

     

       12
       13
        
       

     

       13
       14
        
         # Work around a known issue in Cygwin.  See

     

       14
       15
        
         # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for

+16 -3

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

···

       1
       1
       -
       { stdenv, fetchurl, which, pkgconfig, perl, guile, libxml2 }:

     

       1
       1
       +
       { stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       11
       11
        
       

     

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

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ which pkgconfig perl ];

     

       15
       15
       -
         buildInputs = [ guile libxml2 ];

     

       14
       14
       +
         nativeBuildInputs = [ which pkgconfig perl ]

     

       15
       15
       +
           # autogen needs a build autogen when cross-compiling

     

       16
       16
       +
           ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       17
       17
       +
             buildPackages.autogen buildPackages.texinfo ];

     

       18
       18
       +
         buildInputs = [

     

       19
       19
       +
           guile libxml2

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       23
       23
       +
           "--with-libxml2=${libxml2.dev}"

     

       24
       24
       +
           "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2"

     

       25
       25
       +
           # the configure check for regcomp wants to run a host program

     

       26
       26
       +
           "libopts_cv_with_libregex=yes"

     

       27
       27
       +
           #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo"

     

       28
       28
       +
         ];

     

       16
       29
        
       

     

       17
       30
        
         postPatch = ''

     

       18
       31
        
           # Fix a broken sed expression used for detecting the minor

+4

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

···

       30
       30
        
       

     

       31
       31
        
         patches = [ ./dfile.patch ];

     

       32
       32
        
       

     

       33
       33
       +
         postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

     

       34
       34
       +
           substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       33
       37
        
         # Stop build scripts from searching global include paths

     

       34
       38
        
         LSOF_INCLUDE = "${stdenv.cc.libc}/include";

     

       35
       39
        
         configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}";

+6

pkgs/development/tools/misc/patchelf/unstable.nix

···

       10
       10
        
           sha256 = "1f1s8q3as3nrhcc1a8qc2z7imm644jfz44msn9sfv4mdynp2m2yb";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       +
         # Drop test that fails on musl (?)

     

       14
       14
       +
         postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

     

       15
       15
       +
           substituteInPlace tests/Makefile.am \

     

       16
       16
       +
             --replace "set-rpath-library.sh" ""

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       13
       19
        
         setupHook = [ ./setup-hook.sh ];

     

       14
       20
        
       

     

       15
       21
        
         nativeBuildInputs = [ autoreconfHook ];

+4

pkgs/games/2048-in-terminal/default.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ ncurses ];

     

       15
       15
        
       

     

       16
       16
       +
         prePatch = ''

     

       17
       17
       +
           sed -i '1i#include <fcntl.h>\n' save.c

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       16
       20
        
         enableParallelBuilding = true;

     

       17
       21
        
       

     

       18
       22
        
         preInstall = ''

+2

pkgs/games/armagetronad/default.nix

···

       15
       15
        
       

     

       16
       16
        
         NIX_LDFLAGS = [ "-lSDL_image" ];

     

       17
       17
        
       

     

       18
       18
       +
         enableParallelBuilding = true;

     

       19
       19
       +
       

     

       18
       20
        
         configureFlags = [ "--disable-etc" ];

     

       19
       21
        
         buildInputs = [ SDL SDL_image libxml2 libjpeg libpng mesa zlib ];

     

       20
       22

+22

pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch

···

       1
       1
       +
       diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp

     

       2
       2
       +
       index ecc94c9..936452f 100644

     

       3
       3
       +
       --- a/icuSources/i18n/ucoleitr.cpp

     

       4
       4
       +
       +++ b/icuSources/i18n/ucoleitr.cpp

     

       5
       5
       +
       @@ -320,7 +320,7 @@ ucol_nextProcessed(UCollationElements *elems,

     

       6
       6
       +
                           int32_t            *ixHigh,

     

       7
       7
       +
                           UErrorCode         *status)

     

       8
       8
       +
        {

     

       9
       9
       +
       -    return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);

     

       10
       10
       +
       +    return (UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);

     

       11
       11
       +
        }

     

       12
       12
       +
        

     

       13
       13
       +
        

     

       14
       14
       +
       @@ -384,7 +384,7 @@ ucol_previousProcessed(UCollationElements *elems,

     

       15
       15
       +
                           int32_t            *ixHigh,

     

       16
       16
       +
                           UErrorCode         *status)

     

       17
       17
       +
        {

     

       18
       18
       +
       -    return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);

     

       19
       19
       +
       +    return (UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);

     

       20
       20
       +
        }

     

       21
       21
       +
        

     

       22
       22
       +
        U_NAMESPACE_BEGIN

+2

pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix

···

       3
       3
        
       appleDerivation {

     

       4
       4
        
         nativeBuildInputs = [ cctools ];

     

       5
       5
        
       

     

       6
       6
       +
         patches = [ ./clang-5.patch ];

     

       7
       7
       +
       

     

       6
       8
        
         postPatch = ''

     

       7
       9
        
           substituteInPlace makefile \

     

       8
       10
        
             --replace /usr/bin/ "" \

+26 -1

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

···

       1
       1
       -
       { stdenv, fetchurl, makeWrapper, autoreconfHook

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, makeWrapper, autoreconfHook

     

       2
       2
        
       , pkgconfig, which

     

       3
       3
        
       , flex, bison

     

       4
       4
        
       , linuxHeaders ? stdenv.cc.libc.linuxHeaders

     
···

       35
       35
        
           substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"

     

       36
       36
        
         '';

     

       37
       37
        
       

     

       38
       38
       +
         # use 'if c then x else null' to avoid rebuilding

     

       39
       39
       +
         # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [

     

       40
       40
       +
         patches = if stdenv.hostPlatform.isMusl then [

     

       41
       41
       +
           (fetchpatch {

     

       42
       42
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";

     

       43
       43
       +
             name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch";

     

       44
       44
       +
             sha256 = "0pj1bzifghxwxlc39j8hyy17dkjr9fk64kkj94ayymyprz4i4nac";

     

       45
       45
       +
           })

     

       46
       46
       +
           (fetchpatch {

     

       47
       47
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";

     

       48
       48
       +
             name = "0003-Added-missing-typedef-definitions-on-parser.patch";

     

       49
       49
       +
             sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0";

     

       50
       50
       +
           })

     

       51
       51
       +
           (fetchpatch {

     

       52
       52
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";

     

       53
       53
       +
             name = "0007-Do-not-build-install-vim-file-with-utils-package.patch";

     

       54
       54
       +
             sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4";

     

       55
       55
       +
           })

     

       56
       56
       +
           # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12)

     

       57
       57
       +
         ] else null;

     

       58
       58
       +
       

     

       38
       59
        
         # FIXME: convert these to a single multiple-outputs package?

     

       39
       60
        
       

     

       40
       61
        
         libapparmor = stdenv.mkDerivation {

     
···

       63
       84
        
             substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h"

     

       64
       85
        
             substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h"

     

       65
       86
        
           '';

     

       87
       87
       +
           inherit patches;

     

       88
       88
       +
       

     

       66
       89
        
           postPatch = "cd ./libraries/libapparmor";

     

       67
       90
        
           configureFlags = "--with-python --with-perl";

     

       68
       91
        
       

     
···

       90
       113
        
           ];

     

       91
       114
        
       

     

       92
       115
        
           prePatch = prePatchCommon;

     

       116
       116
       +
           inherit patches;

     

       93
       117
        
           postPatch = "cd ./utils";

     

       94
       118
        
           makeFlags = ''LANGS='';

     

       95
       119
        
           installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin VIM_INSTALL_PATH=$(out)/share PYPREFIX='';

     
···

       145
       169
        
             ## techdoc.pdf still doesn't build ...

     

       146
       170
        
             substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages"

     

       147
       171
        
           '';

     

       172
       172
       +
           inherit patches;

     

       148
       173
        
           postPatch = "cd ./parser";

     

       149
       174
        
           makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include'';

     

       150
       175
        
           installFlags = ''DESTDIR=$(out) DISTRO=unknown'';

+17 -1

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

···

       1
       1
        
       {

     

       2
       2
       -
         stdenv, buildPackages, fetchurl,

     

       2
       2
       +
         stdenv, buildPackages, fetchurl, fetchpatch,

     

       3
       3
        
         enablePython ? false, python ? null,

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       27
       27
        
       

     

       28
       28
        
         enableParallelBuilding = true;

     

       29
       29
        
       

     

       30
       30
       +
         patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [

     

       31
       31
       +
           (fetchpatch {

     

       32
       32
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0002-auparse-remove-use-of-rawmemchr.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696";

     

       33
       33
       +
             name = "0002-auparse-remove-use-of-rawmemchr.patch";

     

       34
       34
       +
             sha256 = "1caaqbfgb2rq3ria5bz4n8x30ihgihln6w9w9a46k62ba0wh9rkz";

     

       35
       35
       +
           })

     

       36
       36
       +
           (fetchpatch {

     

       37
       37
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0003-all-get-rid-of-strndupa.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696";

     

       38
       38
       +
             name = "0003-all-get-rid-of-strndupa.patch";

     

       39
       39
       +
             sha256 = "1ddrm6a0ijrf7caw1wpw2kkbjp2lkxkmc16v51j5j7dvdalc6591";

     

       40
       40
       +
           })

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         prePatch = ''

     

       44
       44
       +
           sed -i 's,#include <sys/poll.h>,#include <poll.h>\n#include <limits.h>,' audisp/audispd.c

     

       45
       45
       +
         '';

     

       30
       46
        
         meta = {

     

       31
       47
        
           description = "Audit Library";

     

       32
       48
        
           homepage = http://people.redhat.com/sgrubb/audit/;

+2 -2

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

···

       1
       1
       -
       { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages_5, kernel

     

       1
       1
       +
       { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel

     

       2
       2
        
       , flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [

     

       16
       16
       -
           llvmPackages_5.llvm llvmPackages_5.clang-unwrapped kernel

     

       16
       16
       +
           llvmPackages.llvm llvmPackages.clang-unwrapped kernel

     

       17
       17
        
           elfutils python pythonPackages.netaddr luajit netperf iperf

     

       18
       18
        
         ];

     

       19
       19

+12 -2

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

···

       1
       1
        
       { stdenv, lib, buildPackages, fetchurl, fetchpatch

     

       2
       2
        
       , enableStatic ? false

     

       3
       3
        
       , enableMinimal ? false

     

       4
       4
       -
       , useMusl ? false, musl

     

       4
       4
       +
       , useMusl ? stdenv.hostPlatform.libc == "musl", musl

     

       5
       5
        
       , extraConfig ? ""

     

       6
       6
        
       , buildPlatform, hostPlatform

     

       7
       7
        
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       assert stdenv.hostPlatform.libc == "musl" -> useMusl;

     

       8
       10
        
       

     

       9
       11
        
       let

     

       10
       12
        
         configParser = ''

     
···

       24
       26
        
           }

     

       25
       27
        
         '';

     

       26
       28
        
       

     

       29
       29
       +
         libcConfig = lib.optionalString useMusl ''

     

       30
       30
       +
           CONFIG_FEATURE_UTMP n

     

       31
       31
       +
           CONFIG_FEATURE_WTMP n

     

       32
       32
       +
         '';

     

       27
       33
        
       in

     

       28
       34
        
       

     

       29
       35
        
       stdenv.mkDerivation rec {

     
···

       67
       73
        
           # Set paths for console fonts.

     

       68
       74
        
           CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd"

     

       69
       75
        
       

     

       76
       76
       +
           # Bump from 4KB, much faster I/O

     

       77
       77
       +
           CONFIG_FEATURE_COPYBUF_KB 64

     

       78
       78
       +
       

     

       70
       79
        
           ${extraConfig}

     

       71
       80
        
           CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}"

     

       81
       81
       +
           ${libcConfig}

     

       72
       82
        
           EOF

     

       73
       83
        
       

     

       74
       84
        
           make oldconfig

     
···

       77
       87
        
         '';

     

       78
       88
        
       

     

       79
       89
        
         postConfigure = lib.optionalString useMusl ''

     

       80
       80
       -
           makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")

     

       90
       90
       +
           makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")

     

       81
       91
        
         '';

     

       82
       92
        
       

     

       83
       93
        
         depsBuildBuild = [ buildPackages.stdenv.cc ];

+7 -1

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

···

       1
       1
       -
       { fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig }:

     

       1
       1
       +
       { fetchurl, stdenv, lib, flex, bash, bison, db, iptables, pkgconfig }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     
···

       12
       12
        
         preConfigure = ''

     

       13
       13
        
           patchShebangs ./configure

     

       14
       14
        
           sed -e '/ARPDDIR/d' -i Makefile

     

       15
       15
       +
           # Don't build netem tools--they're not installed and require HOSTCC

     

       16
       16
       +
           substituteInPlace Makefile --replace " netem " " "

     

       15
       17
        
         '';

     

       16
       18
        
       

     

       17
       19
        
         makeFlags = [

     
···

       36
       38
        
         nativeBuildInputs = [ bison flex pkgconfig ];

     

       37
       39
        
       

     

       38
       40
        
         enableParallelBuilding = true;

     

       41
       41
       +
       

     

       42
       42
       +
         postInstall = ''

     

       43
       43
       +
           PATH=${bash}/bin:$PATH patchShebangs $out/sbin

     

       44
       44
       +
         '';

     

       39
       45
        
       

     

       40
       46
        
         meta = with stdenv.lib; {

     

       41
       47
        
           homepage = https://wiki.linuxfoundation.org/networking/iproute2;

+4 -5

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

···

       4
       4
        
       , libidn, nettle

     

       5
       5
        
       , SGMLSpm, libgcrypt }:

     

       6
       6
        
       

     

       7
       7
       -
       assert stdenv ? glibc;

     

       8
       8
       -
       

     

       9
       7
        
       let

     

       10
       8
        
         time = "20161105";

     

       11
       9
        
       in

     
···

       23
       21
        
             -i doc/Makefile

     

       24
       22
        
         '';

     

       25
       23
        
       

     

       26
       26
       -
         makeFlags = "USE_GNUTLS=no";

     

       24
       24
       +
         # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111

     

       25
       25
       +
         makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no";

     

       27
       26
        
       

     

       28
       27
        
         buildInputs = [

     

       29
       29
       -
           libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle

     

       30
       30
       -
         ];

     

       28
       28
       +
           libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt nettle

     

       29
       29
       +
         ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn;

     

       31
       30
        
       

     

       32
       31
        
         buildFlags = "man all ninfod";

     

       33
       32

-61

pkgs/os-specific/linux/kernel-headers/4.4.nix

···

       1
       1
       -
       { stdenvNoCC, lib, buildPackages

     

       2
       2
       -
       , buildPlatform, hostPlatform

     

       3
       3
       -
       , fetchurl, perl

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       assert hostPlatform.isLinux;

     

       7
       7
       -
       

     

       8
       8
       -
       let

     

       9
       9
       -
         version = "4.4.10";

     

       10
       10
       -
         inherit (hostPlatform.platform) kernelHeadersBaseConfig;

     

       11
       11
       -
       in

     

       12
       12
       -
       

     

       13
       13
       -
       stdenvNoCC.mkDerivation {

     

       14
       14
       -
         name = "linux-headers-${version}";

     

       15
       15
       -
       

     

       16
       16
       -
         src = fetchurl {

     

       17
       17
       -
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       18
       18
       -
           sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";

     

       19
       19
       -
         };

     

       20
       20
       -
       

     

       21
       21
       -
         targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null;

     

       22
       22
       -
       

     

       23
       23
       -
         platform = hostPlatform.platform.kernelArch;

     

       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
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       28
       28
       -
         nativeBuildInputs = [ perl ];

     

       29
       29
       -
       

     

       30
       30
       -
         extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];

     

       31
       31
       -
       

     

       32
       32
       -
         buildPhase = ''

     

       33
       33
       -
           if test -n "$targetConfig"; then

     

       34
       34
       -
              export ARCH=$platform

     

       35
       35
       -
           fi

     

       36
       36
       -
           make ${kernelHeadersBaseConfig} SHELL=bash

     

       37
       37
       -
           make mrproper headers_check SHELL=bash

     

       38
       38
       -
         '';

     

       39
       39
       -
       

     

       40
       40
       -
         installPhase = ''

     

       41
       41
       -
           make INSTALL_HDR_PATH=$out headers_install

     

       42
       42
       -
       

     

       43
       43
       -
           # Some builds (e.g. KVM) want a kernel.release.

     

       44
       44
       -
           mkdir -p $out/include/config

     

       45
       45
       -
           echo "${version}-default" > $out/include/config/kernel.release

     

       46
       46
       -
         '';

     

       47
       47
       -
       

     

       48
       48
       -
         # !!! hacky

     

       49
       49
       -
         fixupPhase = ''

     

       50
       50
       -
           ln -s asm $out/include/asm-$platform

     

       51
       51
       -
           if test "$platform" = "i386" -o "$platform" = "x86_64"; then

     

       52
       52
       -
             ln -s asm $out/include/asm-x86

     

       53
       53
       -
           fi

     

       54
       54
       -
         '';

     

       55
       55
       -
       

     

       56
       56
       -
         meta = with lib; {

     

       57
       57
       -
           description = "Header files and scripts for Linux kernel";

     

       58
       58
       -
           license = licenses.gpl2;

     

       59
       59
       -
           platforms = platforms.linux;

     

       60
       60
       -
         };

     

       61
       61
       -
       }

+67

pkgs/os-specific/linux/kernel-headers/default.nix

···

       1
       1
       +
       { stdenvNoCC, lib, buildPackages

     

       2
       2
       +
       , buildPlatform, hostPlatform

     

       3
       3
       +
       , fetchurl, perl

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       assert hostPlatform.isLinux;

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation {

     

       10
       10
       +
           name = "linux-headers-${version}";

     

       11
       11
       +
       

     

       12
       12
       +
           src = fetchurl {

     

       13
       13
       +
             url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       14
       14
       +
             inherit sha256;

     

       15
       15
       +
           };

     

       16
       16
       +
       

     

       17
       17
       +
           ARCH = hostPlatform.platform.kernelArch;

     

       18
       18
       +
       

     

       19
       19
       +
           # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.

     

       20
       20
       +
           # We do this so we have a build->build, not build->host, C compiler.

     

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

     

       22
       22
       +
           nativeBuildInputs = [ perl ];

     

       23
       23
       +
       

     

       24
       24
       +
           extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];

     

       25
       25
       +
       

     

       26
       26
       +
           # "patches" array defaults to 'null' to avoid changing hash

     

       27
       27
       +
           # and causing mass rebuild

     

       28
       28
       +
           inherit patches;

     

       29
       29
       +
       

     

       30
       30
       +
           buildPhase = ''

     

       31
       31
       +
             make mrproper headers_check SHELL=bash

     

       32
       32
       +
           '';

     

       33
       33
       +
       

     

       34
       34
       +
           installPhase = ''

     

       35
       35
       +
             make INSTALL_HDR_PATH=$out headers_install

     

       36
       36
       +
       

     

       37
       37
       +
             # Some builds (e.g. KVM) want a kernel.release.

     

       38
       38
       +
             mkdir -p $out/include/config

     

       39
       39
       +
             echo "${version}-default" > $out/include/config/kernel.release

     

       40
       40
       +
           '';

     

       41
       41
       +
       

     

       42
       42
       +
           # !!! hacky

     

       43
       43
       +
           fixupPhase = ''

     

       44
       44
       +
             ln -s asm $out/include/asm-$platform

     

       45
       45
       +
             if test "$platform" = "i386" -o "$platform" = "x86_64"; then

     

       46
       46
       +
               ln -s asm $out/include/asm-x86

     

       47
       47
       +
             fi

     

       48
       48
       +
           '';

     

       49
       49
       +
       

     

       50
       50
       +
           meta = with lib; {

     

       51
       51
       +
             description = "Header files and scripts for Linux kernel";

     

       52
       52
       +
             license = licenses.gpl2;

     

       53
       53
       +
             platforms = platforms.linux;

     

       54
       54
       +
           };

     

       55
       55
       +
         };

     

       56
       56
       +
       in {

     

       57
       57
       +
       

     

       58
       58
       +
         linuxHeaders_4_4 = common {

     

       59
       59
       +
           version = "4.4.10";

     

       60
       60
       +
           sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";

     

       61
       61
       +
         };

     

       62
       62
       +
       

     

       63
       63
       +
         linuxHeaders_4_15 = common {

     

       64
       64
       +
           version = "4.15";

     

       65
       65
       +
           sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";

     

       66
       66
       +
         };

     

       67
       67
       +
       }

+3 -1

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

···

       1
       1
       -
       { stdenv, fetchurl, zlib }:

     

       1
       1
       +
       { stdenv, buildPackages, fetchurl, zlib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "kexec-tools-${version}";

     
···

       14
       14
        
       

     

       15
       15
        
         hardeningDisable = [ "format" "pic" "relro" ];

     

       16
       16
        
       

     

       17
       17
       +
         configureFlags = [ "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}cc" ];

     

       18
       18
       +
         nativeBuildInputs = [ buildPackages.stdenv.cc ];

     

       17
       19
        
         buildInputs = [ zlib ];

     

       18
       20
        
       

     

       19
       21
        
         meta = with stdenv.lib; {

+4 -1

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

···

       1
       1
       -
       { stdenv, fetchurl, attr, perl, pam ? null }:

     

       1
       1
       +
       { stdenv, buildPackages, fetchurl, attr, perl, pam ? null }:

     

       2
       2
        
       assert pam != null -> stdenv.isLinux;

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
         outputs = [ "out" "dev" "lib" "man" "doc" ]

     

       14
       14
        
           ++ stdenv.lib.optional (pam != null) "pam";

     

       15
       15
        
       

     

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

     

       16
       17
        
         nativeBuildInputs = [ perl ];

     

       17
       18
        
       

     

       18
       19
        
         buildInputs = [ pam ];

     
···

       22
       23
        
         makeFlags = [

     

       23
       24
        
           "lib=lib"

     

       24
       25
        
           (stdenv.lib.optional (pam != null) "PAM_CAP=yes")

     

       26
       26
       +
           "BUILD_CC=$(CC_FOR_BUILD)"

     

       27
       27
       +
           "CC:=$(CC)"

     

       25
       28
        
         ];

     

       26
       29
        
       

     

       27
       30
        
         prePatch = ''

+7 -1

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

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }:

     

       2
       2
        
       

     

       3
       3
        
       let version = "3.3.0"; in

     

       4
       4
        
       stdenv.mkDerivation {

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         outputs = [ "bin" "dev" "out" "man" ];

     

       15
       15
       +
       

     

       16
       16
       +
         patches = stdenv.lib.optional stdenv.hostPlatform.isMusl

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             url = "https://raw.githubusercontent.com/gentoo/musl/48d2a28710ae40877fd3e178ead1fb1bb0baa62c/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch";

     

       19
       19
       +
             sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r";

     

       20
       20
       +
           });

     

       15
       21
        
       

     

       16
       22
        
         nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];

     

       17
       23

+2

pkgs/os-specific/linux/lm-sensors/default.nix

···

       20
       20
        
         buildInputs = [ bison flex which perl ]

     

       21
       21
        
          ++ stdenv.lib.optional sensord rrdtool;

     

       22
       22
        
       

     

       23
       23
       +
         patches = [ ./musl-fix-includes.patch ];

     

       24
       24
       +
       

     

       23
       25
        
         preBuild = ''

     

       24
       26
        
           makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc

     

       25
       27
        
           ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"})

+62

pkgs/os-specific/linux/lm-sensors/musl-fix-includes.patch

···

       1
       1
       +
       --- lm_sensors-3.3.4.orig/prog/dump/isadump.c

     

       2
       2
       +
       +++ lm_sensors-3.3.4/prog/dump/isadump.c

     

       3
       3
       +
       @@ -36,13 +36,7 @@

     

       4
       4
       +
        #include "util.h"

     

       5
       5
       +
        #include "superio.h"

     

       6
       6
       +
        

     

       7
       7
       +
       -

     

       8
       8
       +
       -/* To keep glibc2 happy */

     

       9
       9
       +
       -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0

     

       10
       10
       +
        #include <sys/io.h>

     

       11
       11
       +
       -#else

     

       12
       12
       +
       -#include <asm/io.h>

     

       13
       13
       +
       -#endif

     

       14
       14
       +
        

     

       15
       15
       +
        #ifdef __powerpc__

     

       16
       16
       +
        unsigned long isa_io_base = 0; /* XXX for now */

     

       17
       17
       +
       --- lm_sensors-3.3.4.orig/prog/dump/isaset.c

     

       18
       18
       +
       +++ lm_sensors-3.3.4/prog/dump/isaset.c

     

       19
       19
       +
       @@ -32,13 +32,7 @@

     

       20
       20
       +
        #include <string.h>

     

       21
       21
       +
        #include "util.h"

     

       22
       22
       +
        

     

       23
       23
       +
       -

     

       24
       24
       +
       -/* To keep glibc2 happy */

     

       25
       25
       +
       -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0

     

       26
       26
       +
        #include <sys/io.h>

     

       27
       27
       +
       -#else

     

       28
       28
       +
       -#include <asm/io.h>

     

       29
       29
       +
       -#endif

     

       30
       30
       +
        

     

       31
       31
       +
        #ifdef __powerpc__

     

       32
       32
       +
        unsigned long isa_io_base = 0; /* XXX for now */

     

       33
       33
       +
       --- lm_sensors-3.3.4.orig/prog/dump/superio.c

     

       34
       34
       +
       +++ lm_sensors-3.3.4/prog/dump/superio.c

     

       35
       35
       +
       @@ -20,12 +20,7 @@

     

       36
       36
       +
        */

     

       37
       37
       +
        

     

       38
       38
       +
        #include <stdlib.h>

     

       39
       39
       +
       -

     

       40
       40
       +
       -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0

     

       41
       41
       +
        #include <sys/io.h>

     

       42
       42
       +
       -#else

     

       43
       43
       +
       -#include <asm/io.h>

     

       44
       44
       +
       -#endif

     

       45
       45
       +
        

     

       46
       46
       +
        #include "superio.h"

     

       47
       47
       +
        

     

       48
       48
       +
       --- lm_sensors-3.3.4.orig/prog/dump/util.c

     

       49
       49
       +
       +++ lm_sensors-3.3.4/prog/dump/util.c

     

       50
       50
       +
       @@ -11,12 +11,7 @@

     

       51
       51
       +
        #include <stdio.h>

     

       52
       52
       +
        #include "util.h"

     

       53
       53
       +
        

     

       54
       54
       +
       -/* To keep glibc2 happy */

     

       55
       55
       +
       -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0

     

       56
       56
       +
        #include <sys/io.h>

     

       57
       57
       +
       -#else

     

       58
       58
       +
       -#include <asm/io.h>

     

       59
       59
       +
       -#endif

     

       60
       60
       +
        

     

       61
       61
       +
        /* Return 1 if we should continue, 0 if we should abort */

     

       62
       62
       +
        int user_ack(int def)

+18 -1

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

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid

     

       2
       2
        
       , thin-provisioning-tools, enable_dmeventd ? false }:

     

       3
       3
        
       

     

       4
       4
        
       let

     
···

       41
       41
        
         enableParallelBuilding = true;

     

       42
       42
        
       

     

       43
       43
        
         #patches = [ ./purity.patch ];

     

       44
       44
       +
         patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [

     

       45
       45
       +
           (fetchpatch {

     

       46
       46
       +
             name = "fix-stdio-usage.patch";

     

       47
       47
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";

     

       48
       48
       +
             sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p";

     

       49
       49
       +
           })

     

       50
       50
       +
           (fetchpatch {

     

       51
       51
       +
             name = "mallinfo.patch";

     

       52
       52
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";

     

       53
       53
       +
             sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0";

     

       54
       54
       +
           })

     

       55
       55
       +
           (fetchpatch {

     

       56
       56
       +
             name = "mlockall-default-config.patch";

     

       57
       57
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";

     

       58
       58
       +
             sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l";

     

       59
       59
       +
           })

     

       60
       60
       +
         ];

     

       44
       61
        
       

     

       45
       62
        
         # To prevent make install from failing.

     

       46
       63
        
         preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";

+48 -5

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

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch }:

     

       1
       1
       +
       { stdenv, lib, fetchurl

     

       2
       2
       +
       , buildPackages

     

       3
       3
       +
       , linuxHeaders ? null

     

       4
       4
       +
       , useBSDCompatHeaders ? true

     

       5
       5
       +
       }:

     

       6
       6
       +
       let

     

       7
       7
       +
         cdefs_h = fetchurl {

     

       8
       8
       +
           url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-cdefs.h";

     

       9
       9
       +
           sha256 = "16l3dqnfq0f20rzbkhc38v74nqcsh9n3f343bpczqq8b1rz6vfrh";

     

       10
       10
       +
         };

     

       11
       11
       +
         queue_h = fetchurl {

     

       12
       12
       +
           url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-queue.h";

     

       13
       13
       +
           sha256 = "12qm82id7zys92a1qh2l1qf2wqgq6jr4qlbjmqyfffz3s3nhfd61";

     

       14
       14
       +
         };

     

       15
       15
       +
         tree_h = fetchurl {

     

       16
       16
       +
           url = "http://git.alpinelinux.org/cgit/aports/plain/main/libc-dev/sys-tree.h";

     

       17
       17
       +
           sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71";

     

       18
       18
       +
         };

     

       2
       19
        
       

     

       20
       20
       +
       in

     

       3
       21
        
       stdenv.mkDerivation rec {

     

       4
       22
        
         name    = "musl-${version}";

     

       5
       23
        
         version = "1.1.18";

     

       6
       24
        
       

     

       7
       25
        
         src = fetchurl {

     

       8
       8
       -
           url    = "http://www.musl-libc.org/releases/${name}.tar.gz";

     

       26
       26
       +
           url    = "http://www.musl-libc.org/releases/musl-${version}.tar.gz";

     

       9
       27
        
           sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh";

     

       10
       28
        
         };

     

       11
       29
        
       

     
···

       23
       41
        
           "--enable-shared"

     

       24
       42
        
           "--enable-static"

     

       25
       43
        
           "CFLAGS=-fstack-protector-strong"

     

       44
       44
       +
           # Fix cycle between outputs

     

       45
       45
       +
           "--disable-wrapper"

     

       26
       46
        
         ];

     

       27
       47
        
       

     

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

     

       49
       49
       +
       

     

       50
       50
       +
         patches = [ ./few-more-uapi-fixes.patch ];

     

       51
       51
       +
       

     

       28
       52
        
         dontDisableStatic = true;

     

       53
       53
       +
         dontStrip = true;

     

       54
       54
       +
       

     

       55
       55
       +
         postInstall =

     

       56
       56
       +
         ''

     

       57
       57
       +
           # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do.

     

       58
       58
       +
           # Apparently glibc provides scsi itself?

     

       59
       59
       +
           (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .)

     

       60
       60
       +
         '' +

     

       61
       61
       +
         ''

     

       62
       62
       +
           mkdir -p $out/bin

     

       63
       63
       +
           # Create 'ldd' symlink, builtin

     

       64
       64
       +
           ln -s $out/lib/libc.so $out/bin/ldd

     

       65
       65
       +
         '' + lib.optionalString useBSDCompatHeaders ''

     

       66
       66
       +
           install -D ${queue_h} $dev/include/sys/queue.h

     

       67
       67
       +
           install -D ${cdefs_h} $dev/include/sys/cdefs.h

     

       68
       68
       +
           install -D ${tree_h} $dev/include/sys/tree.h

     

       69
       69
       +
         '';

     

       70
       70
       +
       

     

       71
       71
       +
         passthru.linuxHeaders = linuxHeaders;

     

       29
       72
        
       

     

       30
       73
        
         meta = {

     

       31
       74
        
           description = "An efficient, small, quality libc implementation";

     

       32
       75
        
           homepage    = "http://www.musl-libc.org";

     

       33
       33
       -
           license     = stdenv.lib.licenses.mit;

     

       34
       34
       -
           platforms   = stdenv.lib.platforms.linux;

     

       35
       35
       -
           maintainers = [ stdenv.lib.maintainers.thoughtpolice ];

     

       76
       76
       +
           license     = lib.licenses.mit;

     

       77
       77
       +
           platforms   = lib.platforms.linux;

     

       78
       78
       +
           maintainers = [ lib.maintainers.thoughtpolice ];

     

       36
       79
        
         };

     

       37
       80
        
       }

+71

pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch

···

       1
       1
       +
       http://www.openwall.com/lists/musl/2018/01/06/3

     

       2
       2
       +
       

     

       3
       3
       +
       Date: Sat,  6 Jan 2018 23:32:52 +0100

     

       4
       4
       +
       From: Hauke Mehrtens <hauke@...ke-m.de>

     

       5
       5
       +
       To: musl@...ts.openwall.com

     

       6
       6
       +
       Cc: felix.janda@...teo.de,

     

       7
       7
       +
       	Hauke Mehrtens <hauke@...ke-m.de>

     

       8
       8
       +
       Subject: [PATCH v2] Add additional uapi guards for Linux kernel header files

     

       9
       9
       +
       

     

       10
       10
       +
       With Linux kernel 4.16 it will be possible to guard more parts of the

     

       11
       11
       +
       Linux header files from a libc. Make use of this in musl to guard all

     

       12
       12
       +
       the structures and other definitions from the Linux header files which

     

       13
       13
       +
       are also defined by the header files provided by musl. This will make

     

       14
       14
       +
       musl compile with the unmodified Linux kernel user space headers.

     

       15
       15
       +
       

     

       16
       16
       +
       This extends the definitions done in commit 04983f227238 ("make

     

       17
       17
       +
       netinet/in.h suppress clashing definitions from kernel headers")

     

       18
       18
       +
       

     

       19
       19
       +
       The needed patches were recently accepted into the netdev tree and will be integrated in Linux 4.16:

     

       20
       20
       +
       https://patchwork.ozlabs.org/patch/854342/

     

       21
       21
       +
       https://patchwork.ozlabs.org/patch/855293/

     

       22
       22
       +
       ---

     

       23
       23
       +
        include/net/if.h           | 7 +++++++

     

       24
       24
       +
        include/netinet/if_ether.h | 1 +

     

       25
       25
       +
        include/sys/xattr.h        | 2 ++

     

       26
       26
       +
        3 files changed, 10 insertions(+)

     

       27
       27
       +
       

     

       28
       28
       +
       diff --git a/include/net/if.h b/include/net/if.h

     

       29
       29
       +
       index 2f2fcc10..0ee48cd7 100644

     

       30
       30
       +
       --- a/include/net/if.h

     

       31
       31
       +
       +++ b/include/net/if.h

     

       32
       32
       +
       @@ -125,6 +125,13 @@ struct ifconf {

     

       33
       33
       +
        #define ifc_req		ifc_ifcu.ifcu_req

     

       34
       34
       +
        #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)

     

       35
       35
       +
        

     

       36
       36
       +
       +#define __UAPI_DEF_IF_IFCONF					0

     

       37
       37
       +
       +#define __UAPI_DEF_IF_IFMAP					0

     

       38
       38
       +
       +#define __UAPI_DEF_IF_IFNAMSIZ					0

     

       39
       39
       +
       +#define __UAPI_DEF_IF_IFREQ					0

     

       40
       40
       +
       +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS				0

     

       41
       41
       +
       +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO	0

     

       42
       42
       +
       +

     

       43
       43
       +
        #endif

     

       44
       44
       +
        

     

       45
       45
       +
        #ifdef __cplusplus

     

       46
       46
       +
       diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h

     

       47
       47
       +
       index d9a131aa..c2c6e944 100644

     

       48
       48
       +
       --- a/include/netinet/if_ether.h

     

       49
       49
       +
       +++ b/include/netinet/if_ether.h

     

       50
       50
       +
       @@ -133,5 +133,6 @@ do { \

     

       51
       51
       +
        	(enaddr)[5] = ((uint8_t *)ipaddr)[3]; \

     

       52
       52
       +
        } while(0)

     

       53
       53
       +
        

     

       54
       54
       +
       +#define __UAPI_DEF_ETHHDR	0

     

       55
       55
       +
        

     

       56
       56
       +
        #endif

     

       57
       57
       +
       diff --git a/include/sys/xattr.h b/include/sys/xattr.h

     

       58
       58
       +
       index 6479fcc6..52e3dd89 100644

     

       59
       59
       +
       --- a/include/sys/xattr.h

     

       60
       60
       +
       +++ b/include/sys/xattr.h

     

       61
       61
       +
       @@ -24,6 +24,8 @@ int removexattr(const char *, const char *);

     

       62
       62
       +
        int lremovexattr(const char *, const char *);

     

       63
       63
       +
        int fremovexattr(int, const char *);

     

       64
       64
       +
        

     

       65
       65
       +
       +#define __UAPI_DEF_XATTR	0

     

       66
       66
       +
       +

     

       67
       67
       +
        #ifdef __cplusplus

     

       68
       68
       +
        }

     

       69
       69
       +
        #endif

     

       70
       70
       +
       -- 

     

       71
       71
       +
       2.11.0

+14

pkgs/os-specific/linux/musl/fts.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "musl-fts-${version}";

     

       5
       5
       +
         version = "2017-01-13";

     

       6
       6
       +
         src = fetchFromGitHub {

     

       7
       7
       +
           owner = "pullmoll";

     

       8
       8
       +
           repo = "musl-fts";

     

       9
       9
       +
           rev = "0bde52df588e8969879a2cae51c3a4774ec62472";

     

       10
       10
       +
           sha256 = "1q8cpzisziysrs08b89wj0rm4p6dsyl177cclpfa0f7spjm3jg03";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       14
       14
       +
       }

+19

pkgs/os-specific/linux/musl/getconf.nix

···

       1
       1
       +
       { stdenv, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         name = "musl-getconf";

     

       5
       5
       +
         src = fetchurl {

     

       6
       6
       +
           url = "https://raw.githubusercontent.com/alpinelinux/aports/48b16204aeeda5bc1f87e49c6b8e23d9abb07c73/main/musl/getconf.c";

     

       7
       7
       +
           sha256 = "0z14ml5343p5gapxw9fnbn2r72r7v2gk8662iifjrblh6sxhqzfq";

     

       8
       8
       +
         };

     

       9
       9
       +
       

     

       10
       10
       +
         unpackPhase = ":";

     

       11
       11
       +
       

     

       12
       12
       +
         buildPhase = ''$CC $src -o getconf'';

     

       13
       13
       +
         installPhase = ''

     

       14
       14
       +
           mkdir -p $out/bin

     

       15
       15
       +
           cp getconf $out/bin/

     

       16
       16
       +
         '';

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +

+18

pkgs/os-specific/linux/musl/getent.nix

···

       1
       1
       +
       { stdenv, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         name = "musl-getent";

     

       5
       5
       +
         src = fetchurl {

     

       6
       6
       +
           url = "https://raw.githubusercontent.com/alpinelinux/aports/89a718d88ec7466e721f3bbe9ede5ffe58061d78/main/musl/getent.c";

     

       7
       7
       +
           sha256 = "0b4jqnsmv1hjgcz7db3vd61k682aphl59c3yhwya2q7mkc6g48xk";

     

       8
       8
       +
         };

     

       9
       9
       +
       

     

       10
       10
       +
         unpackPhase = ":";

     

       11
       11
       +
       

     

       12
       12
       +
         buildPhase = ''$CC $src -o getent'';

     

       13
       13
       +
         installPhase = ''

     

       14
       14
       +
           mkdir -p $out/bin

     

       15
       15
       +
           cp getent $out/bin/

     

       16
       16
       +
         '';

     

       17
       17
       +
       }

     

       18
       18
       +

+18 -5

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

···

       1
       1
       -
       { stdenv, fetchurl, autoreconfHook }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "numactl-2.0.10";

     

       4
       4
       +
         name = "numactl-${version}";

     

       5
       5
       +
         version = "2.0.11";

     

       5
       6
        
       

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "ftp://oss.sgi.com/www/projects/libnuma/download/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "0qfv2ks6d3gm0mw5sj4cbhsd7cbsb7qm58xvchl2wfzifkzcinnv";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "numactl";

     

       9
       9
       +
           repo = "numactl";

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           sha256 = "0bcffqawwbyrnza8np0whii25mfd0dria35zal9v3l55xcrya3j9";

     

       9
       12
        
         };

     

       10
       13
        
       

     

       11
       14
        
         nativeBuildInputs = [ autoreconfHook ];

     

       15
       15
       +
       

     

       16
       16
       +
         patches = [

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             url = https://raw.githubusercontent.com/gentoo/gentoo/b64d15e731e3d6a7671f0ec6c34a20203cf2609d/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch;

     

       19
       19
       +
             sha256 = "05277kv3x12n2xlh3fgnmxclxfc384mkwb0v9pd91046khj6h843";

     

       20
       20
       +
           })

     

       21
       21
       +
         ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {

     

       22
       22
       +
             url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd;

     

       23
       23
       +
             sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v";

     

       24
       24
       +
           });

     

       12
       25
        
       

     

       13
       26
        
         meta = with stdenv.lib; {

     

       14
       27
        
           description = "Library and tools for non-uniform memory access (NUMA) machines";

+24 -2

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

···

       1
       1
       -
       { stdenv, fetchurl, flex, cracklib }:

     

       1
       1
       +
       { stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "linux-pam-${version}";

     
···

       9
       9
        
           sha256 = "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       +
         patches = stdenv.lib.optionals (hostPlatform.libc == "musl") [

     

       13
       13
       +
           (fetchpatch {

     

       14
       14
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";

     

       15
       15
       +
             sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf";

     

       16
       16
       +
           })

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";

     

       19
       19
       +
             sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81";

     

       20
       20
       +
           })

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/musl-fix-pam_exec.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";

     

       23
       23
       +
             sha256 = "04dx6s9d8cxl40r7m7dc4si47ds4niaqm7902y1d6wcjvs11vrf0";

     

       24
       24
       +
           })

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       12
       27
        
         outputs = [ "out" "doc" "man" /* "modules" */ ];

     

       13
       28
        
       

     

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

     

       14
       30
        
         nativeBuildInputs = [ flex ];

     

       15
       31
        
       

     

       16
       32
        
         buildInputs = [ cracklib ];

     
···

       20
       36
        
         crossAttrs = {

     

       21
       37
        
           propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];

     

       22
       38
        
           preConfigure = preConfigure + ''

     

       23
       23
       -
             ar x ${flex.crossDrv}/lib/libfl.a

     

       39
       39
       +
             $crossConfig-ar x ${flex.crossDrv}/lib/libfl.a

     

       24
       40
        
             mv libyywrap.o libyywrap-target.o

     

       25
       41
        
             ar x ${flex}/lib/libfl.a

     

       26
       42
        
             mv libyywrap.o libyywrap-host.o

     
···

       46
       62
        
       

     

       47
       63
        
         preConfigure = ''

     

       48
       64
        
           configureFlags="$configureFlags --includedir=$out/include/security"

     

       65
       65
       +
         '' + stdenv.lib.optionalString (hostPlatform.libc == "musl") ''

     

       66
       66
       +
             # export ac_cv_search_crypt=no

     

       67
       67
       +
             # (taken from Alpine linux, apparently insecure but also doesn't build O:))

     

       68
       68
       +
             # disable insecure modules

     

       69
       69
       +
             # sed -e 's/pam_rhosts//g' -i modules/Makefile.am

     

       70
       70
       +
             sed -e 's/pam_rhosts//g' -i modules/Makefile.in

     

       49
       71
        
         '';

     

       50
       72
        
       

     

       51
       73
        
         meta = {

+4 -3

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

···

       9
       9
        
         glibc =

     

       10
       10
        
           if hostPlatform != buildPlatform

     

       11
       11
        
           then glibcCross

     

       12
       12
       -
           else assert stdenv ? glibc; stdenv.glibc;

     

       12
       12
       +
           else assert hostPlatform.libc == "glibc"; stdenv.cc.libc;

     

       13
       13
        
       

     

       14
       14
        
         dots_in_usernames = fetchpatch {

     

       15
       15
        
           url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch;

     
···

       60
       60
        
           configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog ";

     

       61
       61
        
         '';

     

       62
       62
        
       

     

       63
       63
       -
         configureFlags = " --enable-man ";

     

       63
       63
       +
         configureFlags = " --enable-man "

     

       64
       64
       +
           + stdenv.lib.optionalString (hostPlatform.libc != "glibc") " --disable-nscd ";

     

       64
       65
        
       

     

       65
       65
       -
         preBuild = assert glibc != null;

     

       66
       66
       +
         preBuild = stdenv.lib.optionalString (hostPlatform.libc == "glibc")

     

       66
       67
        
           ''

     

       67
       68
        
             substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd

     

       68
       69
        
           '';

+186 -155

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

···

       1
       1
        
       { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod

     

       2
       2
        
       , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi

     

       3
       3
       -
       , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4

     

       4
       4
       -
       , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp

     

       5
       5
       -
       , iptables, gnu-efi

     

       3
       3
       +
       , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor

     

       4
       4
       +
       , audit, lz4, bzip2, kexectools, libmicrohttpd

     

       5
       5
       +
       , linuxHeaders ? stdenv.cc.libc.linuxHeaders

     

       6
       6
       +
       , libseccomp, iptables, gnu-efi

     

       6
       7
        
       , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45

     

       8
       8
       +
       , ninja, meson, python3Packages, glibcLocales

     

       9
       9
       +
       , patchelf

     

       10
       10
       +
       , getent

     

       7
       11
        
       }:

     

       8
       12
        
       

     

       9
       13
        
       assert stdenv.isLinux;

     

       10
       14
        
       

     

       11
       11
       -
       stdenv.mkDerivation rec {

     

       12
       12
       -
         version = "234";

     

       13
       13
       -
         name = "systemd-${version}";

     

       15
       15
       +
       let

     

       16
       16
       +
         pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);

     

       14
       17
        
       

     

       15
       15
       -
         src = fetchFromGitHub {

     

       16
       16
       -
           owner = "nixos";

     

       17
       17
       -
           repo = "systemd";

     

       18
       18
       -
           rev = "eef5613fda5";

     

       19
       19
       -
           sha256 = "0wgh5y319v56hcs82mhs58ipb100cz4x41vz3kh4bq1n7sx88cdz";

     

       20
       20
       -
         };

     

       18
       18
       +
       in

     

       21
       19
        
       

     

       22
       22
       -
         outputs = [ "out" "lib" "man" "dev" ];

     

       20
       20
       +
         stdenv.mkDerivation rec {

     

       21
       21
       +
           version = "237";

     

       22
       22
       +
           name = "systemd-${version}";

     

       23
       23
        
       

     

       24
       24
       -
         nativeBuildInputs =

     

       25
       25
       -
           [ pkgconfig intltool gperf libxslt

     

       26
       26
       -
             /* FIXME: we may be able to prevent the following dependencies

     

       27
       27
       -
                by generating an autoconf'd tarball, but that's probably not

     

       28
       28
       -
                worth it. */

     

       29
       29
       -
             autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45

     

       30
       30
       -
           ];

     

       31
       31
       -
         buildInputs =

     

       32
       32
       -
           [ linuxHeaders libcap kmod xz pam acl

     

       33
       33
       -
             /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror

     

       34
       34
       -
             libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor

     

       35
       35
       -
             iptables gnu-efi

     

       36
       36
       -
           ];

     

       24
       24
       +
           src = fetchFromGitHub {

     

       25
       25
       +
             owner = "NixOS";

     

       26
       26
       +
             repo = "systemd";

     

       27
       27
       +
             rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792";

     

       28
       28
       +
             sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq";

     

       29
       29
       +
           };

     

       37
       30
        
       

     

       38
       38
       -
         configureFlags =

     

       39
       39
       -
           [ "--localstatedir=/var"

     

       40
       40
       -
             "--sysconfdir=/etc"

     

       41
       41
       -
             "--with-rootprefix=$(out)"

     

       42
       42
       -
             "--with-kbd-loadkeys=${kbd}/bin/loadkeys"

     

       43
       43
       -
             "--with-kbd-setfont=${kbd}/bin/setfont"

     

       44
       44
       -
             "--with-rootprefix=$(out)"

     

       45
       45
       -
             "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"

     

       46
       46
       -
             "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"

     

       47
       47
       -
             "--with-dbussessionservicedir=$(out)/share/dbus-1/services"

     

       48
       48
       -
             "--with-tty-gid=3" # tty in NixOS has gid 3

     

       49
       49
       -
             "--disable-tests"

     

       31
       31
       +
           outputs = [ "out" "lib" "man" "dev" ];

     

       32
       32
       +
       

     

       33
       33
       +
           nativeBuildInputs =

     

       34
       34
       +
             [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45

     

       35
       35
       +
               ninja meson

     

       36
       36
       +
               coreutils # meson calls date, stat etc.

     

       37
       37
       +
               pythonLxmlEnv glibcLocales

     

       38
       38
       +
               patchelf getent

     

       39
       39
       +
             ];

     

       40
       40
       +
           buildInputs =

     

       41
       41
       +
             [ linuxHeaders libcap kmod xz pam acl

     

       42
       42
       +
               /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2

     

       43
       43
       +
               libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor

     

       44
       44
       +
               iptables gnu-efi

     

       45
       45
       +
             ];

     

       46
       46
       +
       

     

       47
       47
       +
           #dontAddPrefix = true;

     

       50
       48
        
       

     

       51
       51
       -
             "--enable-lz4"

     

       52
       52
       -
             "--enable-hostnamed"

     

       53
       53
       -
             "--enable-networkd"

     

       54
       54
       -
             "--disable-sysusers"

     

       55
       55
       -
             "--enable-timedated"

     

       56
       56
       -
             "--enable-timesyncd"

     

       57
       57
       -
             "--disable-firstboot"

     

       58
       58
       -
             "--enable-localed"

     

       59
       59
       -
             "--enable-resolved"

     

       60
       60
       -
             "--disable-split-usr"

     

       61
       61
       -
             "--disable-libcurl"

     

       62
       62
       -
             "--disable-libidn"

     

       63
       63
       -
             "--disable-quotacheck"

     

       64
       64
       -
             "--disable-ldconfig"

     

       65
       65
       -
             "--disable-smack"

     

       49
       49
       +
           mesonFlags = [

     

       50
       50
       +
             "-Dloadkeys-path=${kbd}/bin/loadkeys"

     

       51
       51
       +
             "-Dsetfont-path=${kbd}/bin/setfont"

     

       52
       52
       +
             "-Dtty-gid=3" # tty in NixOS has gid 3

     

       53
       53
       +
             # "-Dtests=" # TODO

     

       54
       54
       +
             "-Dlz4=true"

     

       55
       55
       +
             "-Dhostnamed=true"

     

       56
       56
       +
             "-Dnetworkd=true"

     

       57
       57
       +
             "-Dsysusers=false"

     

       58
       58
       +
             "-Dtimedated=true"

     

       59
       59
       +
             "-Dtimesyncd=true"

     

       60
       60
       +
             "-Dfirstboot=false"

     

       61
       61
       +
             "-Dlocaled=true"

     

       62
       62
       +
             "-Dresolve=true"

     

       63
       63
       +
             "-Dsplit-usr=false"

     

       64
       64
       +
             "-Dlibcurl=false"

     

       65
       65
       +
             "-Dlibidn=false"

     

       66
       66
       +
             "-Dlibidn2=true"

     

       67
       67
       +
             "-Dquotacheck=false"

     

       68
       68
       +
             "-Dldconfig=false"

     

       69
       69
       +
             "-Dsmack=true"

     

       70
       70
       +
             "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work

     

       71
       71
       +
             "-Dsystem-gid-max=499"

     

       72
       72
       +
         #    "-Dtime-epoch=1"

     

       66
       73
        
       

     

       67
       67
       -
             (if stdenv.isArm then "--disable-gnuefi" else "--enable-gnuefi")

     

       68
       68
       -
             "--with-efi-libdir=${gnu-efi}/lib"

     

       69
       69
       -
             "--with-efi-includedir=${gnu-efi}/include"

     

       70
       70
       -
             "--with-efi-ldsdir=${gnu-efi}/lib"

     

       74
       74
       +
             (if stdenv.isArm then "-Dgnu-efi=false" else "-Dgnu-efi=true")

     

       75
       75
       +
             "-Defi-libdir=${gnu-efi}/lib"

     

       76
       76
       +
             "-Defi-includedir=${gnu-efi}/include/efi"

     

       77
       77
       +
             "-Defi-ldsdir=${gnu-efi}/lib"

     

       71
       78
        
       

     

       72
       72
       -
             "--with-sysvinit-path="

     

       73
       73
       -
             "--with-sysvrcnd-path="

     

       74
       74
       -
             "--with-rc-local-script-path-stop=/etc/halt.local"

     

       75
       75
       -
           ];

     

       79
       79
       +
             "-Dsysvinit-path="

     

       80
       80
       +
             "-Dsysvrcnd-path="

     

       81
       81
       +
             ];

     

       76
       82
        
       

     

       77
       77
       -
         hardeningDisable = [ "stackprotector" ];

     

       83
       83
       +
           preConfigure =

     

       84
       84
       +
             ''

     

       85
       85
       +
               mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")

     

       86
       86
       +
               mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d)

     

       87
       87
       +
               mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services)

     

       88
       88
       +
               mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)

     

       89
       89
       +
               mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)

     

       90
       90
       +
               mesonFlagsArray+=(-Dsysconfdir=$out/etc)

     

       91
       91
       +
               mesonFlagsArray+=(-Drootprefix=$out)

     

       92
       92
       +
               mesonFlagsArray+=(-Dlibdir=$lib/lib)

     

       93
       93
       +
               mesonFlagsArray+=(-Drootlibdir=$lib/lib)

     

       94
       94
       +
               mesonFlagsArray+=(-Dmandir=$man/lib)

     

       95
       95
       +
               mesonFlagsArray+=(-Dincludedir=$dev/include)

     

       96
       96
       +
               mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)

     

       97
       97
       +
               mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)

     

       78
       98
        
       

     

       79
       79
       -
         patches = [

     

       80
       80
       -
           # TODO: Remove this patch when we have a systemd version

     

       81
       81
       -
           # with https://github.com/systemd/systemd/pull/6678

     

       82
       82
       -
           (fetchpatch {

     

       83
       83
       -
               url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch";

     

       84
       84
       -
               sha256 = "0g3pvqigs69mciw6lj3zg12dmxnhwxndwxdjg78af52xrp0djfg8";

     

       85
       85
       -
           })

     

       86
       86
       -
         ];

     

       99
       99
       +
               # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are?

     

       100
       100
       +
               substituteInPlace meson.build \

     

       101
       101
       +
                 --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \

     

       102
       102
       +
                           "includedir = '$dev/include'" \

     

       103
       103
       +
                 --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \

     

       104
       104
       +
                           "libdir = '$lib/lib'"

     

       87
       105
        
       

     

       88
       88
       -
         preConfigure =

     

       89
       89
       -
           ''

     

       90
       90
       -
             unset RANLIB

     

       106
       106
       +
               export LC_ALL="en_US.UTF-8";

     

       107
       107
       +
               # FIXME: patch this in systemd properly (and send upstream).

     

       108
       108
       +
               # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount

     

       109
       109
       +
               for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do

     

       110
       110
       +
                 test -e $i

     

       111
       111
       +
                 substituteInPlace $i \

     

       112
       112
       +
                   --replace /usr/bin/getent ${getent}/bin/getent \

     

       113
       113
       +
                   --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \

     

       114
       114
       +
                   --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \

     

       115
       115
       +
                   --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \

     

       116
       116
       +
                   --replace /bin/echo ${coreutils}/bin/echo \

     

       117
       117
       +
                   --replace /bin/cat ${coreutils}/bin/cat \

     

       118
       118
       +
                   --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \

     

       119
       119
       +
                   --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \

     

       120
       120
       +
                   --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency

     

       121
       121
       +
               done

     

       91
       122
        
       

     

       92
       92
       -
             ./autogen.sh

     

       123
       123
       +
               for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do

     

       124
       124
       +
                 substituteInPlace $i \

     

       125
       125
       +
                   --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python"

     

       126
       126
       +
               done

     

       93
       127
        
       

     

       94
       94
       -
             # FIXME: patch this in systemd properly (and send upstream).

     

       95
       95
       -
             for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do

     

       96
       96
       -
               test -e $i

     

       97
       97
       -
               substituteInPlace $i \

     

       98
       98
       -
                 --replace /usr/bin/getent ${stdenv.glibc.bin}/bin/getent \

     

       99
       99
       -
                 --replace /bin/mount ${utillinux.bin}/bin/mount \

     

       100
       100
       -
                 --replace /bin/umount ${utillinux.bin}/bin/umount \

     

       101
       101
       -
                 --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \

     

       102
       102
       -
                 --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \

     

       103
       103
       -
                 --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \

     

       104
       104
       -
                 --replace /bin/echo ${coreutils}/bin/echo \

     

       105
       105
       -
                 --replace /bin/cat ${coreutils}/bin/cat \

     

       106
       106
       -
                 --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \

     

       107
       107
       -
                 --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \

     

       108
       108
       -
                 --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency

     

       109
       109
       -
             done

     

       128
       128
       +
               for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do

     

       129
       129
       +
                 substituteInPlace $i \

     

       130
       130
       +
                   --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python"

     

       131
       131
       +
               done

     

       110
       132
        
       

     

       111
       111
       -
             substituteInPlace src/journal/catalog.c \

     

       112
       112
       -
               --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/

     

       133
       133
       +
               substituteInPlace src/journal/catalog.c \

     

       134
       134
       +
                 --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/

     

       135
       135
       +
             '';

     

       113
       136
        
       

     

       114
       114
       -
             configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")

     

       137
       137
       +
           # These defines are overridden by CFLAGS and would trigger annoying

     

       138
       138
       +
           # warning messages

     

       139
       139
       +
           postConfigure = ''

     

       140
       140
       +
             substituteInPlace config.h \

     

       141
       141
       +
               --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \

     

       142
       142
       +
               --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \

     

       143
       143
       +
               --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"

     

       115
       144
        
           '';

     

       116
       145
        
       

     

       117
       117
       -
         PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python

     

       146
       146
       +
           hardeningDisable = [ "stackprotector" ];

     

       118
       147
        
       

     

       119
       119
       -
         NIX_CFLAGS_COMPILE =

     

       120
       120
       -
           [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would

     

       121
       121
       -
             # lead to a cyclic dependency.

     

       122
       122
       -
             "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""

     

       123
       123
       -
             "-fno-stack-protector"

     

       148
       148
       +
           NIX_CFLAGS_COMPILE =

     

       149
       149
       +
             [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would

     

       150
       150
       +
               # lead to a cyclic dependency.

     

       151
       151
       +
               "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""

     

       124
       152
        
       

     

       125
       125
       -
             # Set the release_agent on /sys/fs/cgroup/systemd to the

     

       126
       126
       -
             # currently running systemd (/run/current-system/systemd) so

     

       127
       127
       -
             # that we don't use an obsolete/garbage-collected release agent.

     

       128
       128
       -
             "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""

     

       129
       129
       -
       

     

       130
       130
       -
             "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""

     

       131
       131
       -
           ];

     

       153
       153
       +
               # Set the release_agent on /sys/fs/cgroup/systemd to the

     

       154
       154
       +
               # currently running systemd (/run/current-system/systemd) so

     

       155
       155
       +
               # that we don't use an obsolete/garbage-collected release agent.

     

       156
       156
       +
               "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""

     

       132
       157
        
       

     

       133
       133
       -
         installFlags =

     

       134
       134
       -
           [ "localstatedir=$(TMPDIR)/var"

     

       135
       135
       -
             "sysconfdir=$(out)/etc"

     

       136
       136
       -
             "sysvinitdir=$(TMPDIR)/etc/init.d"

     

       137
       137
       -
             "pamconfdir=$(out)/etc/pam.d"

     

       138
       138
       -
           ];

     

       158
       158
       +
               "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""

     

       159
       159
       +
             ];

     

       139
       160
        
       

     

       140
       140
       -
         postInstall =

     

       141
       141
       -
           ''

     

       142
       142
       -
             # sysinit.target: Don't depend on

     

       143
       143
       -
             # systemd-tmpfiles-setup.service. This interferes with NixOps's

     

       144
       144
       -
             # send-keys feature (since sshd.service depends indirectly on

     

       145
       145
       -
             # sysinit.target).

     

       146
       146
       -
             mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/

     

       161
       161
       +
           postInstall =

     

       162
       162
       +
             ''

     

       163
       163
       +
               # sysinit.target: Don't depend on

     

       164
       164
       +
               # systemd-tmpfiles-setup.service. This interferes with NixOps's

     

       165
       165
       +
               # send-keys feature (since sshd.service depends indirectly on

     

       166
       166
       +
               # sysinit.target).

     

       167
       167
       +
               mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/

     

       147
       168
        
       

     

       148
       148
       -
             mkdir -p $out/example/systemd

     

       149
       149
       -
             mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example

     

       150
       150
       -
             mv $out/lib/systemd/{system,user} $out/example/systemd

     

       169
       169
       +
               mkdir -p $out/example/systemd

     

       170
       170
       +
               mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example

     

       171
       171
       +
               mv $out/lib/systemd/{system,user} $out/example/systemd

     

       151
       172
        
       

     

       152
       152
       -
             rm -rf $out/etc/systemd/system

     

       173
       173
       +
               rm -rf $out/etc/systemd/system

     

       153
       174
        
       

     

       154
       154
       -
             # Install SysV compatibility commands.

     

       155
       155
       -
             mkdir -p $out/sbin

     

       156
       156
       -
             ln -s $out/lib/systemd/systemd $out/sbin/telinit

     

       157
       157
       -
             for i in init halt poweroff runlevel reboot shutdown; do

     

       158
       158
       -
               ln -s $out/bin/systemctl $out/sbin/$i

     

       159
       159
       -
             done

     

       175
       175
       +
               # Install SysV compatibility commands.

     

       176
       176
       +
               mkdir -p $out/sbin

     

       177
       177
       +
               ln -s $out/lib/systemd/systemd $out/sbin/telinit

     

       178
       178
       +
               for i in init halt poweroff runlevel reboot shutdown; do

     

       179
       179
       +
                 ln -s $out/bin/systemctl $out/sbin/$i

     

       180
       180
       +
               done

     

       160
       181
        
       

     

       161
       161
       -
             # Fix reference to /bin/false in the D-Bus services.

     

       162
       162
       -
             for i in $out/share/dbus-1/system-services/*.service; do

     

       163
       163
       -
               substituteInPlace $i --replace /bin/false ${coreutils}/bin/false

     

       164
       164
       -
             done

     

       182
       182
       +
               # Fix reference to /bin/false in the D-Bus services.

     

       183
       183
       +
               for i in $out/share/dbus-1/system-services/*.service; do

     

       184
       184
       +
                 substituteInPlace $i --replace /bin/false ${coreutils}/bin/false

     

       185
       185
       +
               done

     

       165
       186
        
       

     

       166
       166
       -
             rm -rf $out/etc/rpm

     

       187
       187
       +
               rm -rf $out/etc/rpm

     

       167
       188
        
       

     

       168
       168
       -
             rm $lib/lib/*.la

     

       189
       189
       +
               # "kernel-install" shouldn't be used on NixOS.

     

       190
       190
       +
               find $out -name "*kernel-install*" -exec rm {} \;

     

       169
       191
        
       

     

       170
       170
       -
             # "kernel-install" shouldn't be used on NixOS.

     

       171
       171
       -
             find $out -name "*kernel-install*" -exec rm {} \;

     

       192
       192
       +
               # Keep only libudev and libsystemd in the lib output.

     

       193
       193
       +
               mkdir -p $out/lib

     

       194
       194
       +
               mv $lib/lib/security $lib/lib/libnss* $out/lib/

     

       195
       195
       +
             ''; # */

     

       172
       196
        
       

     

       173
       173
       -
             # Keep only libudev and libsystemd in the lib output.

     

       174
       174
       -
             mkdir -p $out/lib

     

       175
       175
       -
             mv $lib/lib/security $lib/lib/libnss* $out/lib/

     

       176
       176
       -
           ''; # */

     

       197
       197
       +
           enableParallelBuilding = true;

     

       177
       198
        
       

     

       178
       178
       -
         enableParallelBuilding = true;

     

       199
       199
       +
           # The rpath to the shared systemd library is not added by meson. The

     

       200
       200
       +
           # functionality was removed by a nixpkgs patch because it would overwrite

     

       201
       201
       +
           # the existing rpath.

     

       202
       202
       +
           postFixup = ''

     

       203
       203
       +
             sharedLib=libsystemd-shared-${version}.so

     

       204
       204
       +
             for prog in `find $out -type f -executable`; do

     

       205
       205
       +
               (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (

     

       206
       206
       +
                 patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog

     

       207
       207
       +
               ) || true

     

       208
       208
       +
             done

     

       209
       209
       +
           '';

     

       179
       210
        
       

     

       180
       180
       -
         # The interface version prevents NixOS from switching to an

     

       181
       181
       -
         # incompatible systemd at runtime.  (Switching across reboots is

     

       182
       182
       -
         # fine, of course.)  It should be increased whenever systemd changes

     

       183
       183
       -
         # in a backwards-incompatible way.  If the interface version of two

     

       184
       184
       -
         # systemd builds is the same, then we can switch between them at

     

       185
       185
       -
         # runtime; otherwise we can't and we need to reboot.

     

       186
       186
       -
         passthru.interfaceVersion = 2;

     

       211
       211
       +
           # The interface version prevents NixOS from switching to an

     

       212
       212
       +
           # incompatible systemd at runtime.  (Switching across reboots is

     

       213
       213
       +
           # fine, of course.)  It should be increased whenever systemd changes

     

       214
       214
       +
           # in a backwards-incompatible way.  If the interface version of two

     

       215
       215
       +
           # systemd builds is the same, then we can switch between them at

     

       216
       216
       +
           # runtime; otherwise we can't and we need to reboot.

     

       217
       217
       +
           passthru.interfaceVersion = 2;

     

       187
       218
        
       

     

       188
       188
       -
         meta = {

     

       189
       189
       -
           homepage = http://www.freedesktop.org/wiki/Software/systemd;

     

       190
       190
       -
           description = "A system and service manager for Linux";

     

       191
       191
       -
           platforms = stdenv.lib.platforms.linux;

     

       192
       192
       -
           maintainers = [ stdenv.lib.maintainers.eelco ];

     

       193
       193
       -
         };

     

       219
       219
       +
           meta = {

     

       220
       220
       +
             homepage = http://www.freedesktop.org/wiki/Software/systemd;

     

       221
       221
       +
             description = "A system and service manager for Linux";

     

       222
       222
       +
             platforms = stdenv.lib.platforms.linux;

     

       223
       223
       +
             maintainers = [ stdenv.lib.maintainers.eelco ];

     

       224
       224
       +
           };

     

       194
       225
        
       }

+14 -1

pkgs/servers/monitoring/net-snmp/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, autoreconfHook, file, openssl, perl, unzip }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, unzip }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "net-snmp-5.7.3";

     
···

       7
       7
        
           url = "mirror://sourceforge/net-snmp/${name}.zip";

     

       8
       8
        
           sha256 = "0gkss3zclm23zwpqfhddca8278id7pk6qx1mydpimdrrcndwgpz8";

     

       9
       9
        
         };

     

       10
       10
       +
       

     

       11
       11
       +
         patches =

     

       12
       12
       +
           let fetchAlpinePatch = name: sha256: fetchpatch {

     

       13
       13
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5";

     

       14
       14
       +
             inherit name sha256;

     

       15
       15
       +
           };

     

       16
       16
       +
         in [

     

       17
       17
       +
           (fetchAlpinePatch "CVE-2015-5621.patch" "05098jyvd9ddr5q26z7scbbvk1bk6x4agpjm6pyprvpc1zpi0y09")

     

       18
       18
       +
           (fetchAlpinePatch "fix-Makefile-PL.patch" "14ilnkj3cr6mpi242hrmmmv8nv4dj0fdgn42qfk9aa7scwsc0lc7")

     

       19
       19
       +
           (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m")

     

       20
       20
       +
           (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid")

     

       21
       21
       +
           (fetchAlpinePatch "remove-U64-typedef.patch" "1msxyhcqkvhqa03dwb50288g7f6nbrcd9cs036m9xc8jdgjb8k8j")

     

       22
       22
       +
         ];

     

       10
       23
        
       

     

       11
       24
        
         preConfigure =

     

       12
       25
        
           ''

+6 -1

pkgs/servers/pulseaudio/default.nix

···

       43
       43
        
           sha256 = "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
       -
         patches = [ ./caps-fix.patch ];

     

       46
       46
       +
         patches = [ ./caps-fix.patch ]

     

       47
       47
       +
           ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {

     

       48
       48
       +
             name = "padsp-fix.patch";

     

       49
       49
       +
             url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244";

     

       50
       50
       +
             sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q";

     

       51
       51
       +
           });

     

       47
       52
        
       

     

       48
       53
        
         outputs = [ "out" "dev" ];

     

       49
       54

+1

pkgs/servers/sql/mariadb/default.nix

···

       62
       62
        
           "-DPLUGIN_AUTH_GSSAPI_CLIENT=NO"

     

       63
       63
        
         ]

     

       64
       64
        
           ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"

     

       65
       65
       +
           ++ optional stdenv.hostPlatform.isMusl "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl

     

       65
       66
        
           ;

     

       66
       67
        
       

     

       67
       68
        
         preConfigure = ''

+1 -1

pkgs/servers/sql/postgresql/default.nix

···

       69
       69
        
               fi

     

       70
       70
        
             '';

     

       71
       71
        
       

     

       72
       72
       -
           postFixup = lib.optionalString (!stdenv.isDarwin)

     

       72
       72
       +
           postFixup = lib.optionalString (!stdenv.isDarwin && stdenv.hostPlatform.libc == "glibc")

     

       73
       73
        
             ''

     

       74
       74
        
               # initdb needs access to "locale" command from glibc.

     

       75
       75
        
               wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin

+1 -3

pkgs/servers/squid/4.nix

···

       27
       27
        
           "--enable-removal-policies=lru,heap"

     

       28
       28
        
           "--enable-delay-pools"

     

       29
       29
        
           "--enable-x-accelerator-vary"

     

       30
       30
       -
         ] ++ stdenv.lib.optionals stdenv.isLinux [

     

       31
       31
       -
           "--enable-linux-netfilter"

     

       32
       32
       -
         ];

     

       30
       30
       +
         ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter";

     

       33
       31
        
       

     

       34
       32
        
         meta = with stdenv.lib; {

     

       35
       33
        
           description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";

+1 -3

pkgs/servers/squid/default.nix

···

       36
       36
        
           "--enable-removal-policies=lru,heap"

     

       37
       37
        
           "--enable-delay-pools"

     

       38
       38
        
           "--enable-x-accelerator-vary"

     

       39
       39
       -
         ] ++ stdenv.lib.optionals stdenv.isLinux [

     

       40
       40
       -
           "--enable-linux-netfilter"

     

       41
       41
       -
         ];

     

       39
       39
       +
         ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter";

     

       42
       40
        
       

     

       43
       41
        
         meta = with stdenv.lib; {

     

       44
       42
        
           description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";

+3

pkgs/servers/x11/xorg/overrides.nix

···

       493
       493
        
                 args.udev

     

       494
       494
        
               ];

     

       495
       495
        
               patches = commonPatches;

     

       496
       496
       +
               prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

     

       497
       497
       +
                 export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"

     

       498
       498
       +
               '';

     

       496
       499
        
               configureFlags = [

     

       497
       500
        
                 "--enable-kdrive"             # not built by default

     

       498
       501
        
                 "--enable-xephyr"

+14 -5

pkgs/shells/bash/4.4.nix

···

       1
       1
        
       { stdenv, buildPackages

     

       2
       2
       -
       , fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison

     

       2
       2
       +
       , fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison, autoconf

     

       3
       3
        
       , buildPlatform, hostPlatform

     

       4
       4
        
       , interactive ? false

     

       5
       5
        
       }:

     
···

       51
       51
        
       

     

       52
       52
        
         patchFlags = "-p0";

     

       53
       53
        
       

     

       54
       54
       -
         patches = upstreamPatches;

     

       54
       54
       +
         patches = upstreamPatches

     

       55
       55
       +
           # https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html

     

       56
       56
       +
           ++ optional (hostPlatform.libc == "musl") (fetchurl {

     

       57
       57
       +
             url = "https://lists.gnu.org/archive/html/bug-bash/2016-10/patchJxugOXrY2y.patch";

     

       58
       58
       +
             sha256 = "1m4v9imidb1cc1h91f2na0b8y9kc5c5fgmpvy9apcyv2kbdcghg1";

     

       59
       59
       +
         });

     

       55
       60
        
       

     

       56
       61
        
         postPatch = optionalString hostPlatform.isCygwin "patch -p2 < ${./cygwin-bash-4.4.11-2.src.patch}";

     

       57
       62
        
       

     
···

       65
       70
        
           "bash_cv_dev_stdin=present"

     

       66
       71
        
           "bash_cv_dev_fd=standard"

     

       67
       72
        
           "bash_cv_termcap_lib=libncurses"

     

       73
       73
       +
         ] ++ optionals (hostPlatform.libc == "musl") [

     

       74
       74
       +
           "--without-bash-malloc"

     

       75
       75
       +
           "--disable-nls"

     

       68
       76
        
         ];

     

       69
       77
        
       

     

       70
       78
        
         # Note: Bison is needed because the patches above modify parse.y.

     

       71
       79
        
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       72
       80
        
         nativeBuildInputs = [bison]

     

       73
       81
        
           ++ optional (texinfo != null) texinfo

     

       74
       74
       -
           ++ optional hostPlatform.isDarwin binutils;

     

       82
       82
       +
           ++ optional hostPlatform.isDarwin binutils

     

       83
       83
       +
           ++ optional (hostPlatform.libc == "musl") autoconf;

     

       75
       84
        
       

     

       76
       85
        
         buildInputs = optional interactive readline70;

     

       77
       86
        
       

     
···

       86
       95
        
       

     

       87
       96
        
         postInstall = ''

     

       88
       97
        
           ln -s bash "$out/bin/sh"

     

       89
       89
       -
           rm $out/lib/bash/Makefile.inc

     

       98
       98
       +
           rm -f $out/lib/bash/Makefile.inc

     

       90
       99
        
         '';

     

       91
       100
        
       

     

       92
       101
        
         postFixup = if interactive

     
···

       96
       105
        
           ''

     

       97
       106
        
           # most space is taken by locale data

     

       98
       107
        
           else ''

     

       99
       99
       -
             rm -r "$out/share" "$out/bin/bashbug"

     

       108
       108
       +
             rm -rf "$out/share" "$out/bin/bashbug"

     

       100
       109
        
           '';

     

       101
       110
        
       

     

       102
       111
        
         meta = with stdenv.lib; {

+2 -2

pkgs/shells/fish/default.nix

···

       1
       1
        
       { stdenv, fetchurl, coreutils, utillinux,

     

       2
       2
        
         nettools, kbd, bc, which, gnused, gnugrep,

     

       3
       3
       -
         groff, man-db, glibc, libiconv, pcre2,

     

       3
       3
       +
         groff, man-db, getent, libiconv, pcre2,

     

       4
       4
        
         gettext, ncurses, python3

     

       5
       5
        
       

     

       6
       6
        
         , writeText

     
···

       142
       142
        
             sed -e "s| ul| ${utillinux}/bin/ul|" \

     

       143
       143
        
                 -i "$out/share/fish/functions/__fish_print_help.fish"

     

       144
       144
        
             for cur in $out/share/fish/functions/*.fish; do

     

       145
       145
       -
               sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \

     

       145
       145
       +
               sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \

     

       146
       146
        
                   -i "$cur"

     

       147
       147
        
             done

     

       148
       148

+1 -1

pkgs/stdenv/adapters.nix

···

       94
       94
        
                     # without proper `file` command, libtool sometimes fails

     

       95
       95
        
                     # to recognize 64-bit DLLs

     

       96
       96
        
                   ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file

     

       97
       97
       -
                   ++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook

     

       97
       97
       +
                   ++ stdenv.lib.optional (hostPlatform.isAarch64 || hostPlatform.libc == "musl") pkgs.updateAutotoolsGnuConfigScriptsHook

     

       98
       98
        
                   ;

     

       99
       99
        
       

     

       100
       100
        
                 crossConfig = hostPlatform.config;

+11

pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         busybox = import <nix/fetchurl.nix> {

     

       3
       3
       +
           url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox;

     

       4
       4
       +
           sha256 = "01s6bwq84wyrjh3rdsgxni9gkzp7ss8rghg0cmp8zd87l79y8y4g";

     

       5
       5
       +
           executable = true;

     

       6
       6
       +
         };

     

       7
       7
       +
         bootstrapTools = import <nix/fetchurl.nix> {

     

       8
       8
       +
           url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz;

     

       9
       9
       +
           sha256 = "0pbqrw9z4ifkijpfpx15l2dzi00rq8c5zg9ghimz5qgr5dx7f7cl";

     

       10
       10
       +
         };

     

       11
       11
       +
       }

+11

pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         busybox = import <nix/fetchurl.nix> {

     

       3
       3
       +
           url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox;

     

       4
       4
       +
           sha256 = "01d0hp1xgrriiy9w0sd9vbqzwxnpwiyah80pi4vrpcmbwji36j1i";

     

       5
       5
       +
           executable = true;

     

       6
       6
       +
         };

     

       7
       7
       +
         bootstrapTools = import <nix/fetchurl.nix> {

     

       8
       8
       +
           url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz;

     

       9
       9
       +
           sha256 = "1r9mz9w8y5jd7gfwfsrvs20qarzxy7bvrp5dlm41hnx6z617if1h";

     

       10
       10
       +
         };

     

       11
       11
       +
       }

+11

pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         busybox = import <nix/fetchurl.nix> {

     

       3
       3
       +
           url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/busybox;

     

       4
       4
       +
           sha256 = "16lzrwwvdk6q3g08gs45pldz0rh6xpln2343xr444960h6wqxl5v";

     

       5
       5
       +
           executable = true;

     

       6
       6
       +
         };

     

       7
       7
       +
         bootstrapTools = import <nix/fetchurl.nix> {

     

       8
       8
       +
           url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz;

     

       9
       9
       +
           sha256 = "0ly0wj8wzbikn2j8sn727vikk90bq36drh98qvfx1kkh5k5azm2j";

     

       10
       10
       +
         };

     

       11
       11
       +
       }

+18

pkgs/stdenv/linux/bootstrap-tools-musl/default.nix

···

       1
       1
       +
       { system, bootstrapFiles }:

     

       2
       2
       +
       

     

       3
       3
       +
       derivation {

     

       4
       4
       +
         name = "bootstrap-tools";

     

       5
       5
       +
       

     

       6
       6
       +
         builder = bootstrapFiles.busybox;

     

       7
       7
       +
       

     

       8
       8
       +
         args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];

     

       9
       9
       +
       

     

       10
       10
       +
         tarball = bootstrapFiles.bootstrapTools;

     

       11
       11
       +
       

     

       12
       12
       +
         inherit system;

     

       13
       13
       +
       

     

       14
       14
       +
         # Needed by the GCC wrapper.

     

       15
       15
       +
         langC = true;

     

       16
       16
       +
         langCC = true;

     

       17
       17
       +
         isGNU = true;

     

       18
       18
       +
       }

+64

pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh

···

       1
       1
       +
       # Unpack the bootstrap tools tarball.

     

       2
       2
       +
       echo Unpacking the bootstrap tools...

     

       3
       3
       +
       $builder mkdir $out

     

       4
       4
       +
       < $tarball $builder unxz | $builder tar x -C $out

     

       5
       5
       +
       

     

       6
       6
       +
       # Set the ELF interpreter / RPATH in the bootstrap binaries.

     

       7
       7
       +
       echo Patching the bootstrap tools...

     

       8
       8
       +
       

     

       9
       9
       +
       if test -f $out/lib/ld.so.?; then

     

       10
       10
       +
          # MIPS case

     

       11
       11
       +
          LD_BINARY=$out/lib/ld.so.?

     

       12
       12
       +
       else

     

       13
       13
       +
          # i686, x86_64 and armv5tel

     

       14
       14
       +
          LD_BINARY=$out/lib/ld-*so.?

     

       15
       15
       +
       fi

     

       16
       16
       +
       

     

       17
       17
       +
       # On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs.  So

     

       18
       18
       +
       # use a copy of patchelf.

     

       19
       19
       +
       LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf .

     

       20
       20
       +
       

     

       21
       21
       +
       for i in $out/bin/* $out/libexec/gcc/*/*/*; do

     

       22
       22
       +
           if [ -L "$i" ]; then continue; fi

     

       23
       23
       +
           if [ -z "${i##*/liblto*}" ]; then continue; fi

     

       24
       24
       +
           echo patching "$i"

     

       25
       25
       +
           LD_LIBRARY_PATH=$out/lib $LD_BINARY \

     

       26
       26
       +
               ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i"

     

       27
       27
       +
       done

     

       28
       28
       +
       

     

       29
       29
       +
       for i in $out/lib/libiconv*.so $out/lib/libpcre* $out/lib/libc.so; do

     

       30
       30
       +
           if [ -L "$i" ]; then continue; fi

     

       31
       31
       +
           echo patching "$i"

     

       32
       32
       +
           $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i"

     

       33
       33
       +
       done

     

       34
       34
       +
       

     

       35
       35
       +
       export PATH=$out/bin

     

       36
       36
       +
       

     

       37
       37
       +
       # Fix the libc linker script.

     

       38
       38
       +
       #cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp

     

       39
       39
       +
       #mv $out/lib/libc.so.tmp $out/lib/libc.so

     

       40
       40
       +
       #cat $out/lib/libpthread.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libpthread.so.tmp

     

       41
       41
       +
       #mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so

     

       42
       42
       +
       

     

       43
       43
       +
       # Provide some additional symlinks.

     

       44
       44
       +
       ln -s bash $out/bin/sh

     

       45
       45
       +
       ln -s bzip2 $out/bin/bunzip2

     

       46
       46
       +
       

     

       47
       47
       +
       # Provide a gunzip script.

     

       48
       48
       +
       cat > $out/bin/gunzip <<EOF

     

       49
       49
       +
       #!$out/bin/sh

     

       50
       50
       +
       exec $out/bin/gzip -d "\$@"

     

       51
       51
       +
       EOF

     

       52
       52
       +
       chmod +x $out/bin/gunzip

     

       53
       53
       +
       

     

       54
       54
       +
       # Provide fgrep/egrep.

     

       55
       55
       +
       echo "#! $out/bin/sh" > $out/bin/egrep

     

       56
       56
       +
       echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep

     

       57
       57
       +
       echo "#! $out/bin/sh" > $out/bin/fgrep

     

       58
       58
       +
       echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep

     

       59
       59
       +
       

     

       60
       60
       +
       # Provide xz (actually only xz -d will work).

     

       61
       61
       +
       echo "#! $out/bin/sh" > $out/bin/xz

     

       62
       62
       +
       echo "exec $builder unxz \"\$@\"" >> $out/bin/xz

     

       63
       63
       +
       

     

       64
       64
       +
       chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/xz

+51 -25

pkgs/stdenv/linux/default.nix

···

       6
       6
        
       { lib

     

       7
       7
        
       , localSystem, crossSystem, config, overlays

     

       8
       8
        
       

     

       9
       9
       -
       , bootstrapFiles ? { # switch

     

       10
       10
       -
           "i686-linux" = import ./bootstrap-files/i686.nix;

     

       11
       11
       -
           "x86_64-linux" = import ./bootstrap-files/x86_64.nix;

     

       12
       12
       -
           "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix;

     

       13
       13
       -
           "armv6l-linux" = import ./bootstrap-files/armv6l.nix;

     

       14
       14
       -
           "armv7l-linux" = import ./bootstrap-files/armv7l.nix;

     

       15
       15
       -
           "aarch64-linux" = import ./bootstrap-files/aarch64.nix;

     

       16
       16
       -
           "mips64el-linux" = import ./bootstrap-files/loongson2f.nix;

     

       17
       17
       -
         }.${localSystem.system}

     

       18
       18
       -
           or (abort "unsupported platform for the pure Linux stdenv")

     

       9
       9
       +
       , bootstrapFiles ?

     

       10
       10
       +
         let table = {

     

       11
       11
       +
           "glibc" = {

     

       12
       12
       +
             "i686-linux" = import ./bootstrap-files/i686.nix;

     

       13
       13
       +
             "x86_64-linux" = import ./bootstrap-files/x86_64.nix;

     

       14
       14
       +
             "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix;

     

       15
       15
       +
             "armv6l-linux" = import ./bootstrap-files/armv6l.nix;

     

       16
       16
       +
             "armv7l-linux" = import ./bootstrap-files/armv7l.nix;

     

       17
       17
       +
             "aarch64-linux" = import ./bootstrap-files/aarch64.nix;

     

       18
       18
       +
             "mips64el-linux" = import ./bootstrap-files/loongson2f.nix;

     

       19
       19
       +
           };

     

       20
       20
       +
           "musl" = {

     

       21
       21
       +
             "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix;

     

       22
       22
       +
             "armv6l-linux"  = import ./bootstrap-files/armv6l-musl.nix;

     

       23
       23
       +
             "x86_64-linux"  = import ./bootstrap-files/x86_64-musl.nix;

     

       24
       24
       +
           };

     

       25
       25
       +
         };

     

       26
       26
       +
         archLookupTable = table.${localSystem.libc}

     

       27
       27
       +
           or (abort "unsupported libc for the pure Linux stdenv");

     

       28
       28
       +
         files = archLookupTable.${localSystem.system}

     

       29
       29
       +
           or (abort "unsupported platform for the pure Linux stdenv");

     

       30
       30
       +
         in files

     

       19
       31
        
       }:

     

       20
       32
        
       

     

       21
       33
        
       assert crossSystem == null;

     
···

       40
       52
        
       

     

       41
       53
        
       

     

       42
       54
        
         # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).

     

       43
       43
       -
         bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };

     

       55
       55
       +
         bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { inherit system bootstrapFiles; };

     

       56
       56
       +
       

     

       57
       57
       +
         getLibc = stage: stage.${localSystem.libc};

     

       44
       58
        
       

     

       45
       59
        
       

     

       46
       60
        
         # This function builds the various standard environments used during

     
···

       82
       96
        
                 cc = prevStage.gcc-unwrapped;

     

       83
       97
        
                 bintools = prevStage.binutils;

     

       84
       98
        
                 isGNU = true;

     

       85
       85
       -
                 libc = prevStage.glibc;

     

       99
       99
       +
                 libc = getLibc prevStage;

     

       86
       100
        
                 inherit (prevStage) coreutils gnugrep;

     

       87
       101
        
                 name = name;

     

       88
       102
        
                 stdenvNoCC = prevStage.ccWrapperStdenv;

     
···

       95
       109
        
       

     

       96
       110
        
                 # stdenv.glibc is used by GCC build to figure out the system-level

     

       97
       111
        
                 # /usr/include directory.

     

       112
       112
       +
                 # TODO: Remove this!

     

       98
       113
        
                 inherit (prevStage) glibc;

     

       99
       114
        
               };

     

       100
       115
        
               overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };

     
···

       113
       128
        
           __raw = true;

     

       114
       129
        
       

     

       115
       130
        
           gcc-unwrapped = null;

     

       116
       116
       -
           glibc = null;

     

       131
       131
       +
           glibc = assert false; null;

     

       132
       132
       +
           musl = assert false; null;

     

       117
       133
        
           binutils = null;

     

       118
       134
        
           coreutils = null;

     

       119
       135
        
           gnugrep = null;

     
···

       135
       151
        
             # will search the Glibc headers before the GCC headers).  So

     

       136
       152
        
             # create a dummy Glibc here, which will be used in the stdenv of

     

       137
       153
        
             # stage1.

     

       138
       138
       -
             glibc = self.stdenv.mkDerivation {

     

       139
       139
       -
               name = "bootstrap-glibc";

     

       154
       154
       +
             ${localSystem.libc} = self.stdenv.mkDerivation {

     

       155
       155
       +
               name = "bootstrap-${localSystem.libc}";

     

       140
       156
        
               buildCommand = ''

     

       141
       157
        
                 mkdir -p $out

     

       142
       158
        
                 ln -s ${bootstrapTools}/lib $out/lib

     

       159
       159
       +
               '' + lib.optionalString (localSystem.libc == "glibc") ''

     

       143
       160
        
                 ln -s ${bootstrapTools}/include-glibc $out/include

     

       161
       161
       +
               '' + lib.optionalString (localSystem.libc == "musl") ''

     

       162
       162
       +
                 ln -s ${bootstrapTools}/include-libc $out/include

     

       144
       163
        
               '';

     

       145
       164
        
             };

     

       146
       165
        
             gcc-unwrapped = bootstrapTools;

     
···

       148
       167
        
               nativeTools = false;

     

       149
       168
        
               nativeLibc = false;

     

       150
       169
        
               buildPackages = { };

     

       151
       151
       -
               libc = self.glibc;

     

       170
       170
       +
               libc = getLibc self;

     

       152
       171
        
               inherit (self) stdenvNoCC coreutils gnugrep;

     

       153
       172
        
               bintools = bootstrapTools;

     

       154
       173
        
               name = "bootstrap-binutils-wrapper";

     
···

       177
       196
        
             binutils = super.binutils_nogold;

     

       178
       197
        
             inherit (prevStage)

     

       179
       198
        
               ccWrapperStdenv

     

       180
       180
       -
               glibc gcc-unwrapped coreutils gnugrep;

     

       199
       199
       +
               gcc-unwrapped coreutils gnugrep;

     

       200
       200
       +
       

     

       201
       201
       +
             ${localSystem.libc} = getLibc prevStage;

     

       181
       202
        
       

     

       182
       203
        
             # A threaded perl build needs glibc/libpthread_nonshared.a,

     

       183
       204
        
             # which is not included in bootstrapTools, so disable threading.

     
···

       203
       224
        
             binutils = prevStage.binutils.override {

     

       204
       225
        
               # Rewrap the binutils with the new glibc, so both the next

     

       205
       226
        
               # stage's wrappers use it.

     

       206
       206
       -
               libc = self.glibc;

     

       227
       227
       +
               libc = getLibc self;

     

       207
       228
        
             };

     

       208
       229
        
           };

     

       209
       230
        
         })

     
···

       218
       239
        
           overrides = self: super: rec {

     

       219
       240
        
             inherit (prevStage)

     

       220
       241
        
               ccWrapperStdenv

     

       221
       221
       -
               binutils glibc coreutils gnugrep

     

       242
       242
       +
               binutils coreutils gnugrep

     

       222
       243
        
               perl patchelf linuxHeaders gnum4 bison;

     

       244
       244
       +
             ${localSystem.libc} = getLibc prevStage;

     

       223
       245
        
             # Link GCC statically against GMP etc.  This makes sense because

     

       224
       246
        
             # these builds of the libraries are only used by GCC, so it

     

       225
       247
        
             # reduces the size of the stdenv closure.

     
···

       247
       269
        
             # because gcc (since JAR support) already depends on zlib, and

     

       248
       270
        
             # then if we already have a zlib we want to use that for the

     

       249
       271
        
             # other purposes (binutils and top-level pkgs) too.

     

       250
       250
       -
             inherit (prevStage) gettext gnum4 bison gmp perl glibc zlib linuxHeaders;

     

       251
       251
       -
       

     

       272
       272
       +
             inherit (prevStage) gettext gnum4 bison gmp perl zlib linuxHeaders;

     

       273
       273
       +
             ${localSystem.libc} = getLibc prevStage;

     

       252
       274
        
             binutils = super.binutils.override {

     

       253
       275
        
               # Don't use stdenv's shell but our own

     

       254
       276
        
               shell = self.bash + "/bin/bash";

     
···

       267
       289
        
               };

     

       268
       290
        
               cc = prevStage.gcc-unwrapped;

     

       269
       291
        
               bintools = self.binutils;

     

       270
       270
       -
               libc = self.glibc;

     

       292
       292
       +
               libc = getLibc self;

     

       271
       293
        
               inherit (self) stdenvNoCC coreutils gnugrep;

     

       272
       294
        
               name = "";

     

       273
       295
        
               shell = self.bash + "/bin/bash";

     
···

       314
       336
        
             inherit (prevStage.stdenv) fetchurlBoot;

     

       315
       337
        
       

     

       316
       338
        
             extraAttrs = {

     

       339
       339
       +
               # TODO: remove this!

     

       317
       340
        
               inherit (prevStage) glibc;

     

       341
       341
       +
       

     

       318
       342
        
               inherit platform bootstrapTools;

     

       319
       343
        
               shellPackage = prevStage.bash;

     

       320
       344
        
             };

     
···

       332
       356
        
                   ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv

     

       333
       357
        
                 )

     

       334
       358
        
               # More complicated cases

     

       335
       335
       -
               ++ [

     

       336
       336
       -
                   glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders

     

       359
       359
       +
               ++ (map (x: getOutput x (getLibc prevStage)) [ "out" "dev" "bin" ] )

     

       360
       360
       +
               ++  [ /*propagated from .dev*/ linuxHeaders

     

       337
       361
        
                   binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params

     

       338
       362
        
                 ]

     

       363
       363
       +
                 ++ lib.optional (localSystem.libc == "musl") libiconv

     

       339
       364
        
                 ++ lib.optionals localSystem.isAarch64

     

       340
       365
        
                   [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];

     

       341
       366
        
       

     

       342
       367
        
             overrides = self: super: {

     

       343
       368
        
               inherit (prevStage)

     

       344
       369
        
                 gzip bzip2 xz bash coreutils diffutils findutils gawk

     

       345
       345
       -
                 glibc gnumake gnused gnutar gnugrep gnupatch patchelf

     

       370
       370
       +
                 gnumake gnused gnutar gnugrep gnupatch patchelf

     

       346
       371
        
                 attr acl paxctl zlib pcre;

     

       372
       372
       +
               ${localSystem.libc} = getLibc prevStage;

     

       347
       373
        
             } // lib.optionalAttrs (super.targetPlatform == localSystem) {

     

       348
       374
        
               # Need to get rid of these when cross-compiling.

     

       349
       375
        
               inherit (prevStage) binutils binutils-raw;

+10 -6

pkgs/stdenv/linux/make-bootstrap-tools-cross.nix

···

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
        
       in with (import ../../../lib).systems.examples; {

     

       10
       10
       -
         armv5tel  = make sheevaplug;

     

       11
       11
       -
         scaleway  = make scaleway-c1;

     

       12
       12
       -
         pogoplug4 = make pogoplug4;

     

       13
       13
       -
         armv6l    = make raspberryPi;

     

       14
       14
       -
         armv7l    = make armv7l-hf-multiplatform;

     

       15
       15
       -
         aarch64   = make aarch64-multiplatform;

     

       10
       10
       +
         armv5tel   = make sheevaplug;

     

       11
       11
       +
         scaleway   = make scaleway-c1;

     

       12
       12
       +
         pogoplug4  = make pogoplug4;

     

       13
       13
       +
         armv6l     = make raspberryPi;

     

       14
       14
       +
         armv7l     = make armv7l-hf-multiplatform;

     

       15
       15
       +
         aarch64    = make aarch64-multiplatform;

     

       16
       16
       +
         x86_64-musl  = make musl64;

     

       17
       17
       +
         i686-musl    = make musl32;

     

       18
       18
       +
         armv6l-musl  = make muslpi;

     

       19
       19
       +
         aarch64-musl = make aarch64-multiplatform-musl;

     

       16
       20
        
       }

+51 -25

pkgs/stdenv/linux/make-bootstrap-tools.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         pkgs = import ../../.. { inherit localSystem crossSystem; };

     

       7
       7
       -
         glibc = if pkgs.hostPlatform != pkgs.buildPlatform

     

       8
       8
       -
                 then pkgs.glibcCross

     

       9
       9
       -
                 else pkgs.glibc;

     

       7
       7
       +
         libc = pkgs.stdenv.cc.libc;

     

       10
       8
        
       in with pkgs; rec {

     

       11
       9
        
       

     

       12
       10
        
       

     
···

       46
       44
        
               set -x

     

       47
       45
        
               mkdir -p $out/bin $out/lib $out/libexec

     

       48
       46
        
       

     

       47
       47
       +
             '' + (if (hostPlatform.libc == "glibc") then ''

     

       49
       48
        
               # Copy what we need of Glibc.

     

       50
       50
       -
               cp -d ${glibc.out}/lib/ld*.so* $out/lib

     

       51
       51
       -
               cp -d ${glibc.out}/lib/libc*.so* $out/lib

     

       52
       52
       -
               cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib

     

       53
       53
       -
               cp -d ${glibc.out}/lib/libm*.so* $out/lib

     

       54
       54
       -
               cp -d ${glibc.out}/lib/libdl*.so* $out/lib

     

       55
       55
       -
               cp -d ${glibc.out}/lib/librt*.so*  $out/lib

     

       56
       56
       -
               cp -d ${glibc.out}/lib/libpthread*.so* $out/lib

     

       57
       57
       -
               cp -d ${glibc.out}/lib/libnsl*.so* $out/lib

     

       58
       58
       -
               cp -d ${glibc.out}/lib/libutil*.so* $out/lib

     

       59
       59
       -
               cp -d ${glibc.out}/lib/libnss*.so* $out/lib

     

       60
       60
       -
               cp -d ${glibc.out}/lib/libresolv*.so* $out/lib

     

       61
       61
       -
               cp -d ${glibc.out}/lib/crt?.o $out/lib

     

       49
       49
       +
               cp -d ${libc.out}/lib/ld*.so* $out/lib

     

       50
       50
       +
               cp -d ${libc.out}/lib/libc*.so* $out/lib

     

       51
       51
       +
               cp -d ${libc.out}/lib/libc_nonshared.a $out/lib

     

       52
       52
       +
               cp -d ${libc.out}/lib/libm*.so* $out/lib

     

       53
       53
       +
               cp -d ${libc.out}/lib/libdl*.so* $out/lib

     

       54
       54
       +
               cp -d ${libc.out}/lib/librt*.so*  $out/lib

     

       55
       55
       +
               cp -d ${libc.out}/lib/libpthread*.so* $out/lib

     

       56
       56
       +
               cp -d ${libc.out}/lib/libnsl*.so* $out/lib

     

       57
       57
       +
               cp -d ${libc.out}/lib/libutil*.so* $out/lib

     

       58
       58
       +
               cp -d ${libc.out}/lib/libnss*.so* $out/lib

     

       59
       59
       +
               cp -d ${libc.out}/lib/libresolv*.so* $out/lib

     

       60
       60
       +
               cp -d ${libc.out}/lib/crt?.o $out/lib

     

       62
       61
        
       

     

       63
       63
       -
               cp -rL ${glibc.dev}/include $out

     

       62
       62
       +
               cp -rL ${libc.dev}/include $out

     

       64
       63
        
               chmod -R u+w "$out"

     

       65
       64
        
       

     

       66
       66
       -
               # glibc can contain linker scripts: find them, copy their deps,

     

       65
       65
       +
               # libc can contain linker scripts: find them, copy their deps,

     

       67
       66
        
               # and get rid of absolute paths (nuke-refs would make them useless)

     

       68
       67
        
               local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib")

     

       69
       69
       -
               cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u)

     

       68
       68
       +
               cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${libc.out}' | sort -u)

     

       70
       69
        
               for f in $lScripts; do

     

       71
       71
       -
                 substituteInPlace "$f" --replace '${glibc.out}/lib/' ""

     

       70
       70
       +
                 substituteInPlace "$f" --replace '${libc.out}/lib/' ""

     

       72
       71
        
               done

     

       73
       72
        
       

     

       74
       73
        
               # Hopefully we won't need these.

     
···

       76
       75
        
               find $out/include -name .install -exec rm {} \;

     

       77
       76
        
               find $out/include -name ..install.cmd -exec rm {} \;

     

       78
       77
        
               mv $out/include $out/include-glibc

     

       78
       78
       +
           '' else if (hostPlatform.libc == "musl") then ''

     

       79
       79
       +
               # Copy what we need from musl

     

       80
       80
       +
               cp ${libc.out}/lib/* $out/lib

     

       81
       81
       +
               cp -rL ${libc.dev}/include $out

     

       82
       82
       +
               chmod -R u+w "$out"

     

       79
       83
        
       

     

       84
       84
       +
               rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video

     

       85
       85
       +
               find $out/include -name .install -exec rm {} \;

     

       86
       86
       +
               find $out/include -name ..install.cmd -exec rm {} \;

     

       87
       87
       +
               mv $out/include $out/include-libc

     

       88
       88
       +
           '' else throw "unsupported libc for bootstrap tools")

     

       89
       89
       +
           + ''

     

       80
       90
        
               # Copy coreutils, bash, etc.

     

       81
       91
        
               cp ${coreutilsMinimal.out}/bin/* $out/bin

     

       82
       92
        
               (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)

     
···

       115
       125
        
               cp -rd ${gcc.cc.out}/libexec/* $out/libexec

     

       116
       126
        
               chmod -R u+w $out/libexec

     

       117
       127
        
               rm -rf $out/libexec/gcc/*/*/plugin

     

       118
       118
       -
               mkdir $out/include

     

       128
       128
       +
               mkdir -p $out/include

     

       119
       129
        
               cp -rd ${gcc.cc.out}/include/c++ $out/include

     

       120
       130
        
               chmod -R u+w $out/include

     

       121
       131
        
               rm -rf $out/include/c++/*/ext/pb_ds

     
···

       126
       136
        
               cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib

     

       127
       137
        
               cp -d ${zlib.out}/lib/libz.so* $out/lib

     

       128
       138
        
               cp -d ${libelf}/lib/libelf.so* $out/lib

     

       139
       139
       +
             '' + lib.optionalString (hostPlatform.libc == "musl") ''

     

       140
       140
       +
               cp -d ${libiconv.out}/lib/libiconv*.so* $out/lib

     

       129
       141
        
       

     

       130
       142
        
             '' + lib.optionalString (hostPlatform != buildPlatform) ''

     

       131
       143
        
               # These needed for cross but not native tools because the stdenv

     
···

       161
       173
        
               mv $out/.pack $out/pack

     

       162
       174
        
       

     

       163
       175
        
               mkdir $out/on-server

     

       164
       164
       -
               tar cvfJ $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack .

     

       176
       176
       +
               XZ_OPT=-9 tar cvJf $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack .

     

       165
       177
        
               cp ${busyboxMinimal}/bin/busybox $out/on-server

     

       166
       178
        
               chmod u+w $out/on-server/busybox

     

       167
       179
        
               nuke-refs $out/on-server/busybox

     
···

       189
       201
        
           bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out";

     

       190
       202
        
         };

     

       191
       203
        
       

     

       192
       192
       -
         bootstrapTools = import ./bootstrap-tools {

     

       193
       193
       -
           inherit (hostPlatform) system;

     

       194
       194
       -
           inherit bootstrapFiles;

     

       195
       195
       -
         };

     

       204
       204
       +
         bootstrapTools = if (hostPlatform.libc == "glibc") then

     

       205
       205
       +
           import ./bootstrap-tools {

     

       206
       206
       +
             inherit (hostPlatform) system;

     

       207
       207
       +
             inherit bootstrapFiles;

     

       208
       208
       +
           }

     

       209
       209
       +
           else if (hostPlatform.libc == "musl") then

     

       210
       210
       +
           import ./bootstrap-tools-musl {

     

       211
       211
       +
             inherit (hostPlatform) system;

     

       212
       212
       +
             inherit bootstrapFiles;

     

       213
       213
       +
           }

     

       214
       214
       +
           else throw "unsupported libc";

     

       196
       215
        
       

     

       197
       216
        
         test = derivation {

     

       198
       217
        
           name = "test-bootstrap-tools";

     
···

       215
       234
        
             grep --version

     

       216
       235
        
             gcc --version

     

       217
       236
        
       

     

       237
       237
       +
           '' + lib.optionalString (hostPlatform.libc == "glibc") ''

     

       218
       238
        
             ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?)

     

       219
       239
        
             export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}"

     

       220
       240
        
             export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"

     

       221
       241
        
             export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"

     

       242
       242
       +
           '' + lib.optionalString (hostPlatform.libc == "musl") ''

     

       243
       243
       +
             ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?)

     

       244
       244
       +
             export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}"

     

       245
       245
       +
             export CC="gcc -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib"

     

       246
       246
       +
             export CXX="g++ -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib"

     

       247
       247
       +
           '' + ''

     

       222
       248
        
       

     

       223
       249
        
             echo '#include <stdio.h>' >> foo.c

     

       224
       250
        
             echo '#include <limits.h>' >> foo.c

+1 -1

pkgs/tools/compression/xz/default.nix

···

       13
       13
        
         doCheck = true;

     

       14
       14
        
       

     

       15
       15
        
         # In stdenv-linux, prevent a dependency on bootstrap-tools.

     

       16
       16
       -
         preConfigure = "unset CONFIG_SHELL";

     

       16
       16
       +
         preConfigure = "CONFIG_SHELL=/bin/sh";

     

       17
       17
        
       

     

       18
       18
        
         postInstall = "rm -rf $out/share/doc";

     

       19
       19

+1

pkgs/tools/misc/findutils/default.nix

···

       21
       21
        
         doCheck

     

       22
       22
        
           =  !hostPlatform.isDarwin

     

       23
       23
        
           && !(hostPlatform.libc == "glibc" && hostPlatform.isi686)

     

       24
       24
       +
           && (hostPlatform.libc != "musl")

     

       24
       25
        
           && hostPlatform == buildPlatform;

     

       25
       26
        
       

     

       26
       27
        
         outputs = [ "out" "info" ];

+17 -3

pkgs/tools/misc/man-db/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, libpipeline, db, groff, makeWrapper }:

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "man-db-2.7.5";

     
···

       11
       11
        
         outputs = [ "out" "doc" ];

     

       12
       12
        
         outputMan = "out"; # users will want `man man` to work

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ pkgconfig makeWrapper ];

     

       15
       15
       -
         buildInputs = [ libpipeline db groff ];

     

       14
       14
       +
         nativeBuildInputs = [ pkgconfig makeWrapper groff ]

     

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

     

       16
       16
       +
         buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input)

     

       17
       17
       +
         checkInputs = [ libiconv /* for 'iconv' binary */ ];

     

       16
       18
        
       

     

       17
       19
        
         postPatch = ''

     

       18
       20
        
           substituteInPlace src/man_db.conf.in \

     
···

       38
       40
        
           # make sure that we don't wrap symlinks (since that changes argv[0] to the -wrapped name)

     

       39
       41
        
           find "$out/bin" -type f | while read file; do

     

       40
       42
        
             wrapProgram "$file" --prefix PATH : "${groff}/bin"

     

       43
       43
       +
           done

     

       44
       44
       +
         '';

     

       45
       45
       +
       

     

       46
       46
       +
         postFixup = stdenv.lib.optionalString (buildPackages.groff != groff) ''

     

       47
       47
       +
           # Check to make sure none of the outputs depend on build-time-only groff:

     

       48
       48
       +
           for outName in $outputs; do

     

       49
       49
       +
             out=''${!outName}

     

       50
       50
       +
             echo "Checking $outName(=$out) for references to build-time groff..."

     

       51
       51
       +
             if grep -r '${buildPackages.groff}' $out; then

     

       52
       52
       +
               echo "Found an erroneous dependency on groff ^^^" >&2

     

       53
       53
       +
               exit 1

     

       54
       54
       +
             fi

     

       41
       55
        
           done

     

       42
       56
        
         '';

     

       43
       57

+7

pkgs/tools/misc/screen/default.nix

···

       16
       16
        
           "--enable-colors256"

     

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
       +
         patches = stdenv.lib.optional stdenv.hostPlatform.isMusl

     

       20
       20
       +
           (fetchpatch {

     

       21
       21
       +
             url = https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff;

     

       22
       22
       +
             sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p";

     

       23
       23
       +
             stripLen = 1;

     

       24
       24
       +
           });

     

       25
       25
       +
       

     

       19
       26
        
         buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam

     

       20
       27
        
                                   ++ stdenv.lib.optional stdenv.isDarwin utmp;

     

       21
       28

+8 -2

pkgs/tools/networking/inetutils/default.nix

···

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ];

     

       17
       17
        
       

     

       18
       18
       -
         configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include";

     

       18
       18
       +
         configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ]

     

       19
       19
       +
         ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd

     

       20
       20
       +
           "--disable-rcp"

     

       21
       21
       +
           "--disable-rsh"

     

       22
       22
       +
           "--disable-rlogin"

     

       23
       23
       +
           "--disable-rexec"

     

       24
       24
       +
         ];

     

       19
       25
        
       

     

       20
       26
        
         # Test fails with "UNIX socket name too long", probably because our

     

       21
       27
        
         # $TMPDIR is too long.

     
···

       25
       31
        
         postInstall = ''

     

       26
       32
        
           # XXX: These programs are normally installed setuid but since it

     

       27
       33
        
           # fails, they end up being non-executable, hence this hack.

     

       28
       28
       -
           chmod +x $out/bin/{ping,ping6,rcp,rlogin,rsh,traceroute}

     

       34
       34
       +
           chmod +x $out/bin/{ping,ping6,${stdenv.lib.optionalString (!stdenv.hostPlatform.isMusl) ''rcp,rlogin,rsh,''}traceroute}

     

       29
       35
        
         '';

     

       30
       36
        
       

     

       31
       37
        
         meta = {

+18 -1

pkgs/tools/networking/iperf/3.nix

···

       1
       1
       -
       { stdenv, fetchurl, openssl }:

     

       1
       1
       +
       { stdenv, fetchurl, openssl, fetchpatch }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "iperf-3.3";

     
···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ openssl ];

     

       12
       12
       +
       

     

       13
       13
       +
         preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

     

       14
       14
       +
           NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE"

     

       15
       15
       +
         '';

     

       16
       16
       +
       

     

       17
       17
       +
         patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [

     

       18
       18
       +
           (fetchpatch {

     

       19
       19
       +
             url = "http://git.alpinelinux.org/cgit/aports/plain/main/iperf3/build-fixes.patch";

     

       20
       20
       +
             name = "fix-musl-build.patch";

     

       21
       21
       +
             sha256 = "0zvfjnqdldh6rc6qggyb310swdnl9qk0m3z1kklnqzgjsh8dskvl";

     

       22
       22
       +
           })

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             url = "http://git.alpinelinux.org/cgit/aports/plain/main/iperf3/remove-pg-flags.patch";

     

       25
       25
       +
             name = "remove-pg-flags.patch";

     

       26
       26
       +
             sha256 = "0lnczhass24kgq59drgdipnhjnw4l1cy6gqza7f2ah1qr4q104rm";

     

       27
       27
       +
           })

     

       28
       28
       +
       ];

     

       12
       29
        
       

     

       13
       30
        
         postInstall = ''

     

       14
       31
        
           ln -s iperf3 $out/bin/iperf

+5

pkgs/tools/networking/openntpd/default.nix

···

       12
       12
        
           sha256 = "1g6hi03ylhv47sbar3xxgsrar8schqfwn4glckh6m6lni67ndq85";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       +
         prePatch = ''

     

       16
       16
       +
           sed -i '20i#include <sys/cdefs.h>' src/ntpd.h

     

       17
       17
       +
           sed -i '19i#include <sys/cdefs.h>' src/log.c

     

       18
       18
       +
         '';

     

       19
       19
       +
       

     

       15
       20
        
         configureFlags = [

     

       16
       21
        
           "--with-privsep-path=${privsepPath}"

     

       17
       22
        
           "--with-privsep-user=${privsepUser}"

+1

pkgs/tools/networking/ppp/default.nix

···

       23
       23
        
               url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4";

     

       24
       24
        
               sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh";

     

       25
       25
        
             })

     

       26
       26
       +
             ./musl-fix-headers.patch

     

       26
       27
        
           ];

     

       27
       28
        
       

     

       28
       29
        
         buildInputs = [ libpcap ];

+137

pkgs/tools/networking/ppp/musl-fix-headers.patch

···

       1
       1
       +
       diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h

     

       2
       2
       +
       index b06eda5..dafa36c 100644

     

       3
       3
       +
       --- a/include/net/ppp_defs.h

     

       4
       4
       +
       +++ b/include/net/ppp_defs.h

     

       5
       5
       +
       @@ -38,6 +38,8 @@

     

       6
       6
       +
        #ifndef _PPP_DEFS_H_

     

       7
       7
       +
        #define _PPP_DEFS_H_

     

       8
       8
       +
        

     

       9
       9
       +
       +#include <sys/time.h>

     

       10
       10
       +
       +

     

       11
       11
       +
        /*

     

       12
       12
       +
         * The basic PPP frame.

     

       13
       13
       +
         */

     

       14
       14
       +
       diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux

     

       15
       15
       +
       index a74c914..7acd2cf 100644

     

       16
       16
       +
       --- a/pppd/Makefile.linux

     

       17
       17
       +
       +++ b/pppd/Makefile.linux

     

       18
       18
       +
       @@ -126,7 +126,7 @@ LIBS	+= -lcrypt

     

       19
       19
       +
        endif

     

       20
       20
       +
        

     

       21
       21
       +
        ifdef USE_LIBUTIL

     

       22
       22
       +
       -CFLAGS	+= -DHAVE_LOGWTMP=1

     

       23
       23
       +
       +#CFLAGS	+= -DHAVE_LOGWTMP=1

     

       24
       24
       +
        LIBS	+= -lutil

     

       25
       25
       +
        endif

     

       26
       26
       +
        

     

       27
       27
       +
       diff --git a/pppd/magic.h b/pppd/magic.h

     

       28
       28
       +
       index c81213b..305aece 100644

     

       29
       29
       +
       --- a/pppd/magic.h

     

       30
       30
       +
       +++ b/pppd/magic.h

     

       31
       31
       +
       @@ -42,6 +42,8 @@

     

       32
       32
       +
         * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $

     

       33
       33
       +
         */

     

       34
       34
       +
        

     

       35
       35
       +
       +#include <sys/cdefs.h>

     

       36
       36
       +
       +

     

       37
       37
       +
        void magic_init __P((void));	/* Initialize the magic number generator */

     

       38
       38
       +
        u_int32_t magic __P((void));	/* Returns the next magic number */

     

       39
       39
       +
        

     

       40
       40
       +
       diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c

     

       41
       41
       +
       index 91e9a57..9c0fac3 100644

     

       42
       42
       +
       --- a/pppd/plugins/rp-pppoe/if.c

     

       43
       43
       +
       +++ b/pppd/plugins/rp-pppoe/if.c

     

       44
       44
       +
       @@ -30,10 +30,6 @@ static char const RCSID[] =

     

       45
       45
       +
        #include <linux/if_packet.h>

     

       46
       46
       +
        #endif

     

       47
       47
       +
        

     

       48
       48
       +
       -#ifdef HAVE_NET_ETHERNET_H

     

       49
       49
       +
       -#include <net/ethernet.h>

     

       50
       50
       +
       -#endif

     

       51
       51
       +
       -

     

       52
       52
       +
        #ifdef HAVE_ASM_TYPES_H

     

       53
       53
       +
        #include <asm/types.h>

     

       54
       54
       +
        #endif

     

       55
       55
       +
       diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c

     

       56
       56
       +
       index a8c2bb4..ca34d79 100644

     

       57
       57
       +
       --- a/pppd/plugins/rp-pppoe/plugin.c

     

       58
       58
       +
       +++ b/pppd/plugins/rp-pppoe/plugin.c

     

       59
       59
       +
       @@ -46,7 +46,6 @@ static char const RCSID[] =

     

       60
       60
       +
        #include <unistd.h>

     

       61
       61
       +
        #include <fcntl.h>

     

       62
       62
       +
        #include <signal.h>

     

       63
       63
       +
       -#include <net/ethernet.h>

     

       64
       64
       +
        #include <net/if_arp.h>

     

       65
       65
       +
        #include <linux/ppp_defs.h>

     

       66
       66
       +
        #include <linux/if_pppox.h>

     

       67
       67
       +
       diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c

     

       68
       68
       +
       index 3d3bf4e..b5f82d3 100644

     

       69
       69
       +
       --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c

     

       70
       70
       +
       +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c

     

       71
       71
       +
       @@ -27,10 +27,6 @@

     

       72
       72
       +
        #include <linux/if_packet.h>

     

       73
       73
       +
        #endif

     

       74
       74
       +
        

     

       75
       75
       +
       -#ifdef HAVE_NET_ETHERNET_H

     

       76
       76
       +
       -#include <net/ethernet.h>

     

       77
       77
       +
       -#endif

     

       78
       78
       +
       -

     

       79
       79
       +
        #ifdef HAVE_ASM_TYPES_H

     

       80
       80
       +
        #include <asm/types.h>

     

       81
       81
       +
        #endif

     

       82
       82
       +
       @@ -55,6 +51,8 @@ void die(int status)

     

       83
       83
       +
        	exit(status);

     

       84
       84
       +
        }

     

       85
       85
       +
        

     

       86
       86
       +
       +#define error(x...) fprintf(stderr, x)

     

       87
       87
       +
       +

     

       88
       88
       +
        /* Initialize frame types to RFC 2516 values.  Some broken peers apparently

     

       89
       89
       +
           use different frame types... sigh... */

     

       90
       90
       +
        

     

       91
       91
       +
       diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h

     

       92
       92
       +
       index 9ab2eee..4d68147 100644

     

       93
       93
       +
       --- a/pppd/plugins/rp-pppoe/pppoe.h

     

       94
       94
       +
       +++ b/pppd/plugins/rp-pppoe/pppoe.h

     

       95
       95
       +
       @@ -86,18 +86,6 @@ typedef unsigned long UINT32_t;

     

       96
       96
       +
        

     

       97
       97
       +
        #include <netinet/in.h>

     

       98
       98
       +
        

     

       99
       99
       +
       -#ifdef HAVE_NETINET_IF_ETHER_H

     

       100
       100
       +
       -#include <sys/types.h>

     

       101
       101
       +
       -

     

       102
       102
       +
       -#ifdef HAVE_SYS_SOCKET_H

     

       103
       103
       +
       -#include <sys/socket.h>

     

       104
       104
       +
       -#endif

     

       105
       105
       +
       -#ifndef HAVE_SYS_DLPI_H

     

       106
       106
       +
       -#include <netinet/if_ether.h>

     

       107
       107
       +
       -#endif

     

       108
       108
       +
       -#endif

     

       109
       109
       +
       -

     

       110
       110
       +
       -

     

       111
       111
       +
        

     

       112
       112
       +
        /* Ethernet frame types according to RFC 2516 */

     

       113
       113
       +
        #define ETH_PPPOE_DISCOVERY 0x8863

     

       114
       114
       +
       diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c

     

       115
       115
       +
       index 6d71530..86d224e 100644

     

       116
       116
       +
       --- a/pppd/sys-linux.c

     

       117
       117
       +
       +++ b/pppd/sys-linux.c

     

       118
       118
       +
       @@ -102,19 +102,11 @@

     

       119
       119
       +
        #define MAX_ADDR_LEN 7

     

       120
       120
       +
        #endif

     

       121
       121
       +
        

     

       122
       122
       +
       -#if __GLIBC__ >= 2

     

       123
       123
       +
        #include <asm/types.h>		/* glibc 2 conflicts with linux/types.h */

     

       124
       124
       +
        #include <net/if.h>

     

       125
       125
       +
        #include <net/if_arp.h>

     

       126
       126
       +
        #include <net/route.h>

     

       127
       127
       +
        #include <netinet/if_ether.h>

     

       128
       128
       +
       -#else

     

       129
       129
       +
       -#include <linux/types.h>

     

       130
       130
       +
       -#include <linux/if.h>

     

       131
       131
       +
       -#include <linux/if_arp.h>

     

       132
       132
       +
       -#include <linux/route.h>

     

       133
       133
       +
       -#include <linux/if_ether.h>

     

       134
       134
       +
       -#endif

     

       135
       135
       +
        #include <netinet/in.h>

     

       136
       136
       +
        #include <arpa/inet.h>

     

       137
       137
       +

+4

pkgs/tools/networking/siege/default.nix

···

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ openssl zlib ];

     

       14
       14
        
       

     

       15
       15
       +
         prePatch = ''

     

       16
       16
       +
           sed -i -e 's/u_int32_t/uint32_t/g' -e '1i#include <stdint.h>' src/hash.c

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       15
       19
        
         configureFlags = [

     

       16
       20
        
           "--with-ssl=${openssl.dev}"

     

       17
       21
        
           "--with-zlib=${zlib.dev}"

+1 -1

pkgs/tools/networking/unbound/default.nix

···

       27
       27
        
       

     

       28
       28
        
         installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];

     

       29
       29
        
       

     

       30
       30
       -
         preFixup = stdenv.lib.optionalString stdenv.isLinux

     

       30
       30
       +
         preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit

     

       31
       31
        
           # Build libunbound again, but only against nettle instead of openssl.

     

       32
       32
        
           # This avoids gnutls.out -> unbound.lib -> openssl.out.

     

       33
       33
        
           # There was some problem with this on Darwin; let's not complicate non-Linux.

+8 -35

pkgs/tools/package-management/nix/default.nix

···

       2
       2
        
       , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli

     

       3
       3
        
       , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl

     

       4
       4
        
       , libseccomp, busybox-sandbox-shell

     

       5
       5
       -
       , hostPlatform

     

       5
       5
       +
       , hostPlatform, buildPlatform

     

       6
       6
        
       , storeDir ? "/nix/store"

     

       7
       7
        
       , stateDir ? "/nix/var"

     

       8
       8
        
       , confDir ? "/etc"

     
···

       24
       24
        
       

     

       25
       25
        
           nativeBuildInputs =

     

       26
       26
        
             [ pkgconfig ]

     

       27
       27
       -
             ++ lib.optionals (!is20) [ perl ]

     

       27
       27
       +
             ++ lib.optionals (!is20) [ curl perl ]

     

       28
       28
        
             ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];

     

       29
       29
        
       

     

       30
       30
       -
           buildInputs = [ curl openssl sqlite xz ]

     

       30
       30
       +
           buildInputs = [ curl openssl sqlite xz bzip2 ]

     

       31
       31
        
             ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium

     

       32
       32
        
             ++ lib.optionals fromGit [ brotli ] # Since 1.12

     

       33
       33
        
             ++ lib.optional stdenv.isLinux libseccomp

     
···

       39
       39
        
       

     

       40
       40
        
           propagatedBuildInputs = [ boehmgc ];

     

       41
       41
        
       

     

       42
       42
       -
           # Note: bzip2 is not passed as a build input, because the unpack phase

     

       43
       43
       -
           # would end up using the wrong bzip2 when cross-compiling.

     

       44
       44
       -
           # XXX: The right thing would be to reinstate `--with-bzip2' in Nix.

     

       45
       45
       -
           postUnpack =

     

       46
       46
       -
             '' export CPATH="${bzip2.dev}/include"

     

       47
       47
       -
                export LIBRARY_PATH="${bzip2.out}/lib"

     

       48
       48
       -
                export CXXFLAGS="-Wno-error=reserved-user-defined-literal"

     

       49
       49
       -
             '';

     

       50
       50
       -
       

     

       51
       42
        
           configureFlags =

     

       52
       43
        
             [ "--with-store-dir=${storeDir}"

     

       53
       44
        
               "--localstatedir=${stateDir}"

     
···

       61
       52
        
               "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"

     

       62
       53
        
             ] ++ lib.optionals (is20 && stdenv.isLinux) [

     

       63
       54
        
               "--with-sandbox-shell=${sh}/bin/busybox"

     

       64
       64
       -
             ];

     

       55
       55
       +
             ]

     

       56
       56
       +
             ++ lib.optional (

     

       57
       57
       +
                 hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system

     

       58
       58
       +
             ) ''--with-system=${hostPlatform.nix.system}'';

     

       65
       59
        
       

     

       66
       60
        
           makeFlags = "profiledir=$(out)/etc/profile.d";

     

       67
       61
        
       

     

       68
       62
        
           installFlags = "sysconfdir=$(out)/etc";

     

       69
       63
        
       

     

       70
       70
       -
           doInstallCheck = true;

     

       64
       64
       +
           doInstallCheck = true; # not cross

     

       71
       65
        
       

     

       72
       66
        
           # socket path becomes too long otherwise

     

       73
       67
        
           preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp";

     

       74
       68
        
       

     

       75
       69
        
           separateDebugInfo = stdenv.isLinux;

     

       76
       76
       -
       

     

       77
       77
       -
           crossAttrs = {

     

       78
       78
       -
             postUnpack =

     

       79
       79
       -
               '' export CPATH="${bzip2.crossDrv}/include"

     

       80
       80
       -
                  export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS"

     

       81
       81
       -
               '';

     

       82
       82
       -
       

     

       83
       83
       -
             configureFlags =

     

       84
       84
       -
               ''

     

       85
       85
       -
                 --with-store-dir=${storeDir} --localstatedir=${stateDir}

     

       86
       86
       -
                 --with-dbi=${perlPackages.DBI}/${perl.libPrefix}

     

       87
       87
       -
                 --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}

     

       88
       88
       -
                 --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}

     

       89
       89
       -
                 --disable-init-state

     

       90
       90
       -
                 --enable-gc

     

       91
       91
       -
               '' + stdenv.lib.optionalString (

     

       92
       92
       -
                   hostPlatform ? nix && hostPlatform.nix ? system

     

       93
       93
       -
               ) ''--with-system=${hostPlatform.nix.system}'';

     

       94
       94
       -
       

     

       95
       95
       -
             doInstallCheck = false;

     

       96
       96
       -
           };

     

       97
       70
        
       

     

       98
       71
        
           enableParallelBuilding = true;

     

       99
       72

+1

pkgs/tools/security/sudo/default.nix

···

       28
       28
        
           "--with-logpath=/var/log/sudo.log"

     

       29
       29
        
           "--with-iologdir=/var/log/sudo-io"

     

       30
       30
        
           "--with-sendmail=${sendmailPath}"

     

       31
       31
       +
           "--enable-tmpfiles.d=no"

     

       31
       32
        
         ] ++ stdenv.lib.optional withInsults [

     

       32
       33
        
           "--with-insults"

     

       33
       34
        
           "--with-all-insults"

+9 -2

pkgs/tools/system/smartmontools/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, autoreconfHook

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, autoreconfHook

     

       2
       2
        
       , IOKit ? null , ApplicationServices ? null }:

     

       3
       3
        
       

     

       4
       4
        
       let

     
···

       20
       20
        
           sha256 = "0m1hllbb78rr6cxkbalmz1gqkl0psgq8rrmv4gwcmz34n07kvx2i";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         patches = [ ./smartmontools.patch ];

     

       23
       23
       +
         patches = [ ./smartmontools.patch ]

     

       24
       24
       +
           # https://www.smartmontools.org/changeset/4603

     

       25
       25
       +
           ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {

     

       26
       26
       +
             name = "musl-canonicalize_file_name.patch";

     

       27
       27
       +
             url = "https://www.smartmontools.org/changeset/4603?format=diff&new=4603";

     

       28
       28
       +
             sha256 = "06s9pcd95snjkrbfrsjby2lln3lnwjd21bgabmvr4p7fx19b75zp";

     

       29
       29
       +
             stripLen = 2;

     

       30
       30
       +
           });

     

       24
       31
        
         postPatch = "cp -v ${driverdb} drivedb.h";

     

       25
       32
        
       

     

       26
       33
        
         nativeBuildInputs = [ autoreconfHook ];

+4

pkgs/tools/text/agrep/default.nix

···

       12
       12
        
           sha256 = "14addnwspdf2mxpqyrw8b84bb2257y43g5ccy4ipgrr91fmxq2sk";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       +
         # Related: https://github.com/Wikinaut/agrep/pull/11

     

       16
       16
       +
         prePatch = stdenv.lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.isDarwin) ''

     

       17
       17
       +
           sed -i '1i#include <sys/stat.h>' checkfil.c newmgrep.c recursiv.c

     

       18
       18
       +
         '';

     

       15
       19
        
         installPhase = ''

     

       16
       20
        
           install -Dm 555 agrep -t "$out/bin"

     

       17
       21
        
           install -Dm 444 docs/* -t "$out/doc"

+3 -3

pkgs/tools/text/gnupatch/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "patch-2.7.5";

     

       7
       7
       +
         name = "patch-2.7.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://gnu/patch/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx";

     

       11
       11
       +
           sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = stdenv.lib.optional doCheck ed;

     
···

       17
       17
        
           "ac_cv_func_strnlen_working=yes"

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
       -
         doCheck = true; # not cross;

     

       20
       20
       +
         doCheck = hostPlatform.libc != "musl"; # not cross;

     

       21
       21
        
       

     

       22
       22
        
         meta = {

     

       23
       23
        
           description = "GNU Patch, a program to apply differences to files";

+6

pkgs/tools/text/groff/default.nix

···

       2
       2
        
       , ghostscript #for postscript and html output

     

       3
       3
        
       , psutils, netpbm #for html output

     

       4
       4
        
       , buildPackages

     

       5
       5
       +
       , autoreconfHook

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       stdenv.mkDerivation rec {

     
···

       16
       17
        
         outputs = [ "out" "man" "doc" "info" "perl" ];

     

       17
       18
        
       

     

       18
       19
        
         enableParallelBuilding = false;

     

       20
       20
       +
       

     

       21
       21
       +
         patches = [ ./look-for-ar.patch ];

     

       19
       22
        
       

     

       20
       23
        
         postPatch = stdenv.lib.optionalString (psutils != null) ''

     

       21
       24
        
           substituteInPlace src/preproc/html/pre-html.cpp \

     
···

       32
       35
        
         '';

     

       33
       36
        
       

     

       34
       37
        
         buildInputs = [ ghostscript psutils netpbm perl ];

     

       38
       38
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       35
       39
        
       

     

       36
       40
        
         # Builds running without a chroot environment may detect the presence

     

       37
       41
        
         # of /usr/X11 in the host system, leading to an impure build of the

     
···

       42
       46
        
           "--without-x"

     

       43
       47
        
         ] ++ stdenv.lib.optionals (ghostscript != null) [

     

       44
       48
        
           "--with-gs=${ghostscript}/bin/gs"

     

       49
       49
       +
         ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

     

       50
       50
       +
           "ac_cv_path_PERL=${perl}/bin/perl"

     

       45
       51
        
         ];

     

       46
       52
        
       

     

       47
       53
        
         doCheck = true;

+39

pkgs/tools/text/groff/look-for-ar.patch

···

       1
       1
       +
       commit 988a001f969262089579958827652da00fda096f

     

       2
       2
       +
       Author: Ben Gamari <ben@smart-cactus.org>

     

       3
       3
       +
       Date:   Tue Oct 17 16:15:20 2017 -0400

     

       4
       4
       +
       

     

       5
       5
       +
           Look for AR

     

       6
       6
       +
       

     

       7
       7
       +
       diff --git a/Makefile.in b/Makefile.in

     

       8
       8
       +
       index bc156ce..cc02126 100644

     

       9
       9
       +
       --- a/Makefile.in

     

       10
       10
       +
       +++ b/Makefile.in

     

       11
       11
       +
       @@ -464,7 +464,7 @@ INSTALL_SCRIPT=@INSTALL_SCRIPT@

     

       12
       12
       +
        INSTALL_DATA=@INSTALL_DATA@

     

       13
       13
       +
        INSTALL_INFO=@INSTALL_INFO@

     

       14
       14
       +
        LN_S=@LN_S@

     

       15
       15
       +
       -AR=ar

     

       16
       16
       +
       +AR=@AR@

     

       17
       17
       +
        ETAGS=etags

     

       18
       18
       +
        ETAGSFLAGS=

     

       19
       19
       +
        # Flag that tells etags to assume C++.

     

       20
       20
       +
       diff --git a/configure.ac b/configure.ac

     

       21
       21
       +
       index c779165..6d53f5e 100644

     

       22
       22
       +
       --- a/configure.ac

     

       23
       23
       +
       +++ b/configure.ac

     

       24
       24
       +
       @@ -45,6 +45,7 @@ AC_PREREQ([2.62])

     

       25
       25
       +
        

     

       26
       26
       +
        AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin])

     

       27
       27
       +
        AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp])

     

       28
       28
       +
       +AC_CONFIG_MACRO_DIR([m4])

     

       29
       29
       +
        

     

       30
       30
       +
        AC_USE_SYSTEM_EXTENSIONS

     

       31
       31
       +
        

     

       32
       32
       +
       @@ -73,6 +74,7 @@ GROFF_PROG_YACC

     

       33
       33
       +
        GROFF_DOC_CHECK

     

       34
       34
       +
        GROFF_MAKEINFO

     

       35
       35
       +
        AC_PROG_RANLIB

     

       36
       36
       +
       +AC_CHECK_TOOL([AR], [ar], [ar])

     

       37
       37
       +
        GROFF_INSTALL_SH

     

       38
       38
       +
        GROFF_INSTALL_INFO

     

       39
       39
       +
        AC_PROG_INSTALL

+36 -24

pkgs/top-level/all-packages.nix

···

       5435
       5435
        
                   platform = {

     

       5436
       5436
        
                     name = "ben_nanonote";

     

       5437
       5437
        
                     kernelMajor = "2.6";

     

       5438
       5438
       -
                     # It's not a bcm47xx processor, but for the headers this should work

     

       5439
       5439
       -
                     kernelHeadersBaseConfig = "bcm47xx_defconfig";

     

       5440
       5438
        
                     kernelArch = "mips";

     

       5441
       5439
        
                   };

     

       5442
       5440
        
                   gcc = {

     
···

       5747
       5745
        
           '';

     

       5748
       5746
        
         });

     

       5749
       5747
        
       

     

       5750
       5750
       -
         crystal = callPackage ../development/compilers/crystal {

     

       5751
       5751
       -
           llvm = llvm_5;

     

       5752
       5752
       -
         };

     

       5748
       5748
       +
         crystal = callPackage ../development/compilers/crystal { };

     

       5753
       5749
        
       

     

       5754
       5750
        
         devpi-client = callPackage ../development/tools/devpi-client {};

     

       5755
       5751
        
       

     
···

       5848
       5844
        
           libcCross1 =

     

       5849
       5845
        
             if targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers

     

       5850
       5846
        
             else if targetPlatform.libc == "libSystem" then darwin.xcode

     

       5847
       5847
       +
             else if targetPlatform.libc == "musl" then musl

     

       5851
       5848
        
             else null;

     

       5852
       5849
        
           binutils1 = wrapBintoolsWith {

     

       5853
       5850
        
             bintools = binutils-unwrapped;

     
···

       6387
       6384
        
         llvm_35 = llvmPackages_35.llvm;

     

       6388
       6385
        
         llvm_34 = llvmPackages_34.llvm;

     

       6389
       6386
        
       

     

       6390
       6390
       -
         llvmPackages = recurseIntoAttrs llvmPackages_4;

     

       6387
       6387
       +
         llvmPackages = recurseIntoAttrs llvmPackages_5;

     

       6391
       6388
        
       

     

       6392
       6389
        
         llvmPackagesSelf = llvmPackages_34.override {

     

       6393
       6390
        
           stdenv = libcxxStdenv;

     
···

       6413
       6410
        
           inherit (stdenvAdapters) overrideCC;

     

       6414
       6411
        
         };

     

       6415
       6412
        
       

     

       6416
       6416
       -
         llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({

     

       6413
       6413
       +
         llvmPackages_4 = callPackage ../development/compilers/llvm/4 {

     

       6414
       6414
       +
           inherit (stdenvAdapters) overrideCC;

     

       6415
       6415
       +
         };

     

       6416
       6416
       +
       

     

       6417
       6417
       +
         llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({

     

       6417
       6418
        
           inherit (stdenvAdapters) overrideCC;

     

       6418
       6419
        
         } // stdenv.lib.optionalAttrs stdenv.isDarwin {

     

       6419
       6420
        
           cmake = cmake.override {

     
···

       6424
       6425
        
           python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };

     

       6425
       6426
        
         });

     

       6426
       6427
        
       

     

       6427
       6427
       -
         llvmPackages_5 = callPackage ../development/compilers/llvm/5 {

     

       6428
       6428
       -
           inherit (stdenvAdapters) overrideCC;

     

       6429
       6429
       -
         };

     

       6430
       6430
       -
       

     

       6431
       6428
        
         manticore = callPackage ../development/compilers/manticore { };

     

       6432
       6429
        
       

     

       6433
       6430
        
         mentorToolchains = recurseIntoAttrs (

     
···

       8106
       8103
        
       

     

       8107
       8104
        
         ycmd = callPackage ../development/tools/misc/ycmd {

     

       8108
       8105
        
           inherit (darwin.apple_sdk.frameworks) Cocoa;

     

       8109
       8109
       -
           llvmPackages = llvmPackages_5;

     

       8110
       8106
        
           python = python2;

     

       8111
       8107
        
         };

     

       8112
       8108
        
       

     
···

       8747
       8743
        
           stdenv = crossLibcStdenv;

     

       8748
       8744
        
         };

     

       8749
       8745
        
       

     

       8746
       8746
       +
         muslCross = callPackage ../os-specific/linux/musl {

     

       8747
       8747
       +
           stdenv = crossLibcStdenv;

     

       8748
       8748
       +
         };

     

       8749
       8749
       +
       

     

       8750
       8750
        
         # We can choose:

     

       8751
       8751
        
         libcCrossChooser = name:

     

       8752
       8752
        
           # libc is hackily often used from the previous stage. This `or`

     

       8753
       8753
        
           # hack fixes the hack, *sigh*.

     

       8754
       8754
        
           /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross

     

       8755
       8755
        
           else if name == "uclibc" then uclibcCross

     

       8756
       8756
       +
           else if name == "musl" then targetPackages.muslCross or muslCross

     

       8756
       8757
        
           else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64

     

       8757
       8758
        
           else if name == "libSystem" then darwin.xcode

     

       8758
       8759
        
           else throw "Unknown libc";

     

       8759
       8760
        
       

     

       8760
       8761
        
         libcCross = assert targetPlatform != buildPlatform; libcCrossChooser targetPlatform.libc;

     

       8761
       8762
        
       

     

       8762
       8762
       -
         # Only supported on Linux

     

       8763
       8763
       -
         glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null;

     

       8763
       8763
       +
         # Only supported on Linux, using glibc

     

       8764
       8764
       +
         glibcLocales = if hostPlatform.libc == "glibc" then callPackage ../development/libraries/glibc/locales.nix { } else null;

     

       8764
       8765
        
       

     

       8765
       8766
        
         glibcInfo = callPackage ../development/libraries/glibc/info.nix { };

     

       8766
       8767
        
       

     
···

       9371
       9372
        
       

     

       9372
       9373
        
         libchop = callPackage ../development/libraries/libchop { };

     

       9373
       9374
        
       

     

       9374
       9374
       -
         libclc = callPackage ../development/libraries/libclc {

     

       9375
       9375
       -
           llvmPackages = llvmPackages_5;

     

       9376
       9376
       -
         };

     

       9375
       9375
       +
         libclc = callPackage ../development/libraries/libclc { };

     

       9377
       9376
        
       

     

       9378
       9377
        
         libcli = callPackage ../development/libraries/libcli { };

     

       9379
       9378
        
       

     
···

       9485
       9484
        
         else callPackage ../development/libraries/libelf { };

     

       9486
       9485
        
       

     

       9487
       9486
        
         libetpan = callPackage ../development/libraries/libetpan { };

     

       9487
       9487
       +
       

     

       9488
       9488
       +
         libexecinfo = callPackage ../development/libraries/libexecinfo { };

     

       9488
       9489
        
       

     

       9489
       9490
        
         libfaketime = callPackage ../development/libraries/libfaketime { };

     

       9490
       9491
        
       

     
···

       9762
       9763
        
         };

     

       9763
       9764
        
       

     

       9764
       9765
        
         # On non-GNU systems we need GNU Gettext for libintl.

     

       9765
       9765
       -
         libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;

     

       9766
       9766
       +
         libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext;

     

       9766
       9767
        
       

     

       9767
       9768
        
         libid3tag = callPackage ../development/libraries/libid3tag {

     

       9768
       9769
        
           gperf = gperf_3_0;

     
···

       10270
       10271
        
           # makes it slower, but during runtime we link against just mesa_drivers

     

       10271
       10272
        
           # through /run/opengl-driver*, which is overriden according to config.grsecurity

     

       10272
       10273
        
           # grsecEnabled = true; # no more support in nixpkgs ATM

     

       10273
       10273
       -
       

     

       10274
       10274
       -
           llvmPackages = llvmPackages_5;

     

       10275
       10274
        
         });

     

       10276
       10275
        
       

     

       10277
       10276
        
         mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });

     
···

       12566
       12565
        
         };

     

       12567
       12566
        
       

     

       12568
       12567
        
         xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {

     

       12569
       12569
       -
           inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig

     

       12568
       12568
       +
           inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig

     

       12570
       12569
        
             libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind

     

       12571
       12570
        
             dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook

     

       12572
       12572
       -
             autoconf automake libtool xmlto asciidoc flex bison mtdev pixman

     

       12571
       12571
       +
             autoconf automake libtool mtdev pixman

     

       12573
       12572
        
             cairo epoxy;

     

       12573
       12573
       +
           inherit (buildPackages) pkgconfig xmlto asciidoc flex bison;

     

       12574
       12574
        
           inherit (darwin) apple_sdk cf-private libobjc;

     

       12575
       12575
        
           bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;

     

       12576
       12576
        
           mesa = mesa_noglu;

     
···

       12914
       12914
        
       

     

       12915
       12915
        
         lkl = callPackage ../applications/virtualization/lkl { };

     

       12916
       12916
        
       

     

       12917
       12917
       -
         linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { };

     

       12918
       12918
       -
         linuxHeaders = linuxHeaders_4_4;

     

       12917
       12917
       +
         inherit (callPackages ../os-specific/linux/kernel-headers { })

     

       12918
       12918
       +
           linuxHeaders_4_4 linuxHeaders_4_15;

     

       12919
       12919
       +
         linuxHeaders = if hostPlatform.isMusl then linuxHeaders_4_15 else linuxHeaders_4_4;

     

       12919
       12920
        
       

     

       12920
       12921
        
         kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };

     

       12921
       12922
        
       

     
···

       13344
       13345
        
         multipath-tools = callPackage ../os-specific/linux/multipath-tools { };

     

       13345
       13346
        
       

     

       13346
       13347
        
         musl = callPackage ../os-specific/linux/musl { };

     

       13348
       13348
       +
         musl-fts = callPackage ../os-specific/linux/musl/fts.nix { };

     

       13349
       13349
       +
         musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { };

     

       13350
       13350
       +
         musl-getent = callPackage ../os-specific/linux/musl/getent.nix { };

     

       13351
       13351
       +
         getent =

     

       13352
       13352
       +
           if hostPlatform.isMusl then musl-getent

     

       13353
       13353
       +
           # This may not be right on other platforms, but preserves existing behavior

     

       13354
       13354
       +
           else /* if hostPlatform.libc == "glibc" then */ glibc.bin;

     

       13355
       13355
       +
       

     

       13356
       13356
       +
         getconf =

     

       13357
       13357
       +
           if hostPlatform.isMusl then musl-getconf

     

       13358
       13358
       +
           else lib.getBin stdenv.cc.libc;

     

       13347
       13359
        
       

     

       13348
       13360
        
         nettools = callPackage ../os-specific/linux/net-tools { };

     

       13349
       13361

+2

pkgs/top-level/perl-packages.nix

···

       15080
       15080
        
           meta = {

     

       15081
       15081
        
             description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words";

     

       15082
       15082
        
             license = with stdenv.lib.licenses; [ artistic1 gpl2 ];

     

       15083
       15083
       +
             # bogus use of glibc, pretty sure, think this is what we have glibcLocales for?

     

       15084
       15084
       +
             broken = stdenv.hostPlatform.libc != "glibc";

     

       15083
       15085
        
           };

     

       15084
       15086
        
         };

     

       15085
       15087

+5 -4

pkgs/top-level/python-packages.nix

···

       230
       230
        
         diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };

     

       231
       231
        
       

     

       232
       232
        
         globus-sdk = callPackage ../development/python-modules/globus-sdk { };

     

       233
       233
       -
         

     

       233
       233
       +
       

     

       234
       234
        
         gssapi = callPackage ../development/python-modules/gssapi { };

     

       235
       235
        
       

     

       236
       236
        
         h5py = callPackage ../development/python-modules/h5py {

     
···

       254
       254
        
         };

     

       255
       255
        
       

     

       256
       256
        
         mwoauth = callPackage ../development/python-modules/mwoauth { };

     

       257
       257
       -
         

     

       257
       257
       +
       

     

       258
       258
        
         neuron = pkgs.neuron.override {

     

       259
       259
        
           inherit python;

     

       260
       260
        
         };

     
···

       359
       359
        
         };

     

       360
       360
        
       

     

       361
       361
        
         pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };

     

       362
       362
       -
         

     

       362
       362
       +
       

     

       363
       363
        
         python-sql = callPackage ../development/python-modules/python-sql { };

     

       364
       364
        
       

     

       365
       365
        
         python-stdnum = callPackage ../development/python-modules/python-stdnum { };

     
···

       9727
       9727
        
       

     

       9728
       9728
        
         locustio = callPackage ../development/python-modules/locustio { };

     

       9729
       9729
        
       

     

       9730
       9730
       -
         llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_5;};

     

       9730
       9730
       +
         llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm; };

     

       9731
       9731
        
       

     

       9732
       9732
        
         lockfile = buildPythonPackage rec {

     

       9733
       9733
        
           pname = "lockfile";

     
···

       14685
       14685
        
             substituteInPlace "setup.cfg"                                     \

     

       14686
       14686
        
                     --replace "/usr/local/include" "${pkgs.sqlite.dev}/include"   \

     

       14687
       14687
        
                     --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib"

     

       14688
       14688
       +
             ${stdenv.lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}

     

       14688
       14689
        
           '';

     

       14689
       14690
        
       

     

       14690
       14691
        
           meta = {

+11

pkgs/top-level/release-cross.nix

···

       125
       125
        
         android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // {

     

       126
       126
        
         });

     

       127
       127
        
       

     

       128
       128
       +
         x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;

     

       129
       129
       +
         rpi-musl = mapTestOnCross lib.systems.examples.muslpi  (linuxCommon // {

     

       130
       130
       +
           vim = nativePlatforms;

     

       131
       131
       +
           unzip = nativePlatforms;

     

       132
       132
       +
           ddrescue = nativePlatforms;

     

       133
       133
       +
           lynx = nativePlatforms;

     

       134
       134
       +
           patchelf = nativePlatforms;

     

       135
       135
       +
           buildPackages.binutils = nativePlatforms;

     

       136
       136
       +
           mpg123 = nativePlatforms;

     

       137
       137
       +
         });

     

       138
       138
       +
       

     

       128
       139
        
         /* Cross-built bootstrap tools for every supported platform */

     

       129
       140
        
         bootstrapTools = let

     

       130
       141
        
           tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };