commit 7db611f2af869bac6e31ba814a5593c52d54ec19 · pyrox.dev/nixpkgs

+1 -1

lib/systems/doubles.nix

···

       44
       44
        
         openbsd = filterDoubles predicates.isOpenBSD;

     

       45
       45
        
         unix    = filterDoubles predicates.isUnix;

     

       46
       46
        
       

     

       47
       47
       -
         mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"];

     

       47
       47
       +
         mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"];

     

       48
       48
        
       }

+8

lib/systems/examples.nix

···

       8
       8
        
         #

     

       9
       9
        
         # Linux

     

       10
       10
        
         #

     

       11
       11
       +
         powernv = {

     

       12
       12
       +
           config = "powerpc64le-unknown-linux-gnu";

     

       13
       13
       +
           platform = platforms.powernv;

     

       14
       14
       +
         };

     

       15
       15
       +
         musl-power = {

     

       16
       16
       +
           config = "powerpc64le-unknown-linux-musl";

     

       17
       17
       +
           platform = platforms.powernv;

     

       18
       18
       +
         };

     

       11
       19
        
       

     

       12
       20
        
         sheevaplug = rec {

     

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

+1

lib/systems/inspect.nix

···

       11
       11
        
           isi686         = { cpu = cpuTypes.i686; };

     

       12
       12
        
           isx86_64       = { cpu = cpuTypes.x86_64; };

     

       13
       13
        
           isPowerPC      = { cpu = cpuTypes.powerpc; };

     

       14
       14
       +
           isPower = { cpu = { family = "power"; }; };

     

       14
       15
        
           isx86          = { cpu = { family = "x86"; }; };

     

       15
       16
        
           isAarch32      = { cpu = { family = "arm"; bits = 32; }; };

     

       16
       17
        
           isAarch64      = { cpu = { family = "arm"; bits = 64; }; };

+2

lib/systems/parse.nix

···

       90
       90
        
           mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };

     

       91
       91
        
       

     

       92
       92
        
           powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };

     

       93
       93
       +
           powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };

     

       94
       94
       +
           powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };

     

       93
       95
        
       

     

       94
       96
        
           riscv32  = { bits = 32; significantByte = littleEndian; family = "riscv"; };

     

       95
       97
        
           riscv64  = { bits = 64; significantByte = littleEndian; family = "riscv"; };

+17

lib/systems/platforms.nix

···

       20
       20
        
           kernelAutoModules = false;

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       +
         powernv = {

     

       24
       24
       +
           name = "PowerNV";

     

       25
       25
       +
           kernelArch = "powerpc";

     

       26
       26
       +
           kernelBaseConfig = "powernv_defconfig";

     

       27
       27
       +
           kernelTarget = "zImage";

     

       28
       28
       +
           kernelInstallTarget = "install";

     

       29
       29
       +
           kernelFile = "vmlinux";

     

       30
       30
       +
           kernelAutoModules = true;

     

       31
       31
       +
           # avoid driver/FS trouble arising from unusual page size

     

       32
       32
       +
           kernelExtraConfig = ''

     

       33
       33
       +
             PPC_64K_PAGES n

     

       34
       34
       +
             PPC_4K_PAGES y

     

       35
       35
       +
             IPV6 y

     

       36
       36
       +
           '';

     

       37
       37
       +
         };

     

       38
       38
       +
       

     

       23
       39
        
         ##

     

       24
       40
        
         ## ARM

     

       25
       41
        
         ##

     
···

       458
       474
        
             "armv7l-linux" = armv7l-hf-multiplatform;

     

       459
       475
        
             "aarch64-linux" = aarch64-multiplatform;

     

       460
       476
        
             "mipsel-linux" = fuloong2f_n32;

     

       477
       477
       +
             "powerpc64le-linux" = powernv;

     

       461
       478
        
           }.${system} or pcBase;

     

       462
       479
        
       }

-5

pkgs/applications/graphics/exrtools/default.nix

···

       9
       9
        
           sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         preConfigure = ''

     

       13
       13
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       14
       14
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       15
       15
       -
         '';

     

       16
       16
       -
       

     

       17
       12
        
         nativeBuildInputs = [ pkgconfig ];

     

       18
       13
        
         buildInputs = [ stdenv openexr libpng12 libjpeg ];

     

       19
       14

-5

pkgs/applications/misc/kiwix/default.nix

···

       81
       81
        
           cd ../../..

     

       82
       82
        
         '';

     

       83
       83
        
       

     

       84
       84
       -
         preConfigure = ''

     

       85
       85
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       86
       86
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       87
       87
       -
         '';

     

       88
       88
       -
       

     

       89
       84
        
         configureFlags = [

     

       90
       85
        
           "--disable-static"

     

       91
       86
        
           "--disable-staticbins"

-3

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

···

       12
       12
        
         enableParallelBuilding = true;

     

       13
       13
        
       

     

       14
       14
        
         configurePhase = ''

     

       15
       15
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       16
       16
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       17
       17
       -
       

     

       18
       15
        
           # Set up picosat, so we can build 'aigbmc'

     

       19
       16
        
           mkdir ../picosat

     

       20
       17
        
           ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h

-5

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

···

       15
       15
        
         # --disable-static actually enables static linking here...

     

       16
       16
        
         dontDisableStatic = true;

     

       17
       17
        
       

     

       18
       18
       -
         preConfigure = ''

     

       19
       19
       -
           CC=${stdenv.cc.targetPrefix}gcc

     

       20
       20
       -
           CXX=${stdenv.cc.targetPrefix}g++

     

       21
       21
       -
         '';

     

       22
       22
       -
       

     

       23
       18
        
         makeFlags = [ "LEX=${flex}/bin/flex" ];

     

       24
       19
        
       

     

       25
       20
        
         preInstall = ''

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         # if you bump version, update pkgs.tortoisehg too or ping maintainer

     

       7
       7
       -
         version = "4.6.2";

     

       7
       7
       +
         version = "4.7";

     

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

     

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

     

       10
       10
        
       in python2Packages.buildPythonApplication {

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

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

     

       16
       16
       -
           sha256 = "1bv6wgcdx8glihjjfg22khhc52mclsn4kwfqvzbzlg0b42h4xl0w";

     

       16
       16
       +
           sha256 = "17rl1lyvr3qa5x73xyiwnv09wwiwjd18f01gvispzyvpgx1v3309";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         inherit python; # pass it so that the same version can be used in hg2git

-5

pkgs/applications/virtualization/open-vm-tools/default.nix

···

       41
       41
        
            sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c

     

       42
       42
        
         '';

     

       43
       43
        
       

     

       44
       44
       -
         preConfigure = ''

     

       45
       45
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       46
       46
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       47
       47
       -
         '';

     

       48
       48
       -
       

     

       49
       44
        
         configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]

     

       50
       45
        
           ++ lib.optional (!withX) "--without-x";

     

       51
       46

+2 -2

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

···

       171
       171
        
             else if targetPlatform.isWindows then "pe"

     

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

     

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

     

       174
       174
       -
           sep = optionalString (!targetPlatform.isMips) "-";

     

       174
       174
       +
           sep = optionalString (!targetPlatform.isMips && !targetPlatform.isPower) "-";

     

       175
       175
        
           arch =

     

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

     

       177
       177
        
             else if targetPlatform.isAarch32     then endianPrefix + "arm"

     
···

       183
       183
        
                 "mips64"   = "btsmip";

     

       184
       184
        
                 "mips64el" = "ltsmip";

     

       185
       185
        
               }.${targetPlatform.parsed.cpu.name}

     

       186
       186
       -
             else if targetPlatform.isPowerPC then "powerpc"

     

       186
       186
       +
             else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"

     

       187
       187
        
             else if targetPlatform.isSparc then "sparc"

     

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

     

       189
       189
        
           in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);

+4 -4

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

···

       59
       59
        
           ar as ld nm objcopy objdump readelf ranlib strip strings size windres

     

       60
       60
        
       do

     

       61
       61
        
           if

     

       62
       62
       -
               cmd_path=$(PATH=$_PATH command -v "@targetPrefix@${cmd}")

     

       62
       62
       +
               PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null

     

       63
       63
        
           then

     

       64
       64
        
               upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")"

     

       65
       65
       -
               export "${role_pre}${upper_case}=${cmd_path}";

     

       66
       66
       -
               export "${upper_case}${role_post}=${cmd_path}";

     

       65
       65
       +
               export "${role_pre}${upper_case}=@targetPrefix@${cmd}";

     

       66
       66
       +
               export "${upper_case}${role_post}=@targetPrefix@${cmd}";

     

       67
       67
        
           fi

     

       68
       68
        
       done

     

       69
       69
        
       

     
···

       72
       72
        
       export NIX_HARDENING_ENABLE

     

       73
       73
        
       

     

       74
       74
        
       # No local scope in sourced file

     

       75
       75
       -
       unset -v role_pre role_post cmd cmd_path upper_case

     

       75
       75
       +
       unset -v role_pre role_post cmd upper_case

     

       76
       76
        
       set +u

+4 -4

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

···

       109
       109
        
       

     

       110
       110
        
       export NIX_${role_pre}CC=@out@

     

       111
       111
        
       

     

       112
       112
       -
       export ${role_pre}CC=@out@/bin/@named_cc@

     

       113
       113
       -
       export ${role_pre}CXX=@out@/bin/@named_cxx@

     

       114
       114
       -
       export CC${role_post}=@out@/bin/@named_cc@

     

       115
       115
       -
       export CXX${role_post}=@out@/bin/@named_cxx@

     

       112
       112
       +
       export ${role_pre}CC=@named_cc@

     

       113
       113
       +
       export ${role_pre}CXX=@named_cxx@

     

       114
       114
       +
       export CC${role_post}=@named_cc@

     

       115
       115
       +
       export CXX${role_post}=@named_cxx@

     

       116
       116
        
       

     

       117
       117
        
       # If unset, assume the default hardening flags.

     

       118
       118
        
       : ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"}

+1 -1

pkgs/build-support/setup-hooks/audit-tmpdir.sh

···

       27
       27
        
               fi

     

       28
       28
        
       

     

       29
       29
        
               if  isScript "$i"; then

     

       30
       30
       -
                   if [ -e "$(dirname $i)/.$(basename $i)-wrapped" ]; then

     

       30
       30
       +
                   if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then

     

       31
       31
        
                       if grep -q -F "$TMPDIR" "$i"; then

     

       32
       32
        
                           echo "wrapper script $i contains a forbidden reference to $TMPDIR"

     

       33
       33
        
                           exit 1

+2 -1

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

···

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

     

       55
       55
        
               sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";

     

       56
       56
        
             })

     

       57
       57
       -
             ++ optional langFortran ../gfortran-driving.patch;

     

       57
       57
       +
             ++ optional langFortran ../gfortran-driving.patch

     

       58
       58
       +
             ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;

     

       58
       59
        
       

     

       59
       60
        
           /* Cross-gcc settings (build == host != target) */

     

       60
       61
        
           crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";

+2 -1

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

···

       49
       49
        
               url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";

     

       50
       50
        
               sha256 = ""; # TODO: uncomment and check hash when available.

     

       51
       51
        
             }) */

     

       52
       52
       -
             ++ optional langFortran ../gfortran-driving.patch;

     

       52
       52
       +
             ++ optional langFortran ../gfortran-driving.patch

     

       53
       53
       +
             ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;

     

       53
       54
        
       

     

       54
       55
        
           /* Cross-gcc settings (build == host != target) */

     

       55
       56
        
           crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";

+3

pkgs/development/compilers/gcc/common/platform-flags.nix

···

       10
       10
        
         (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")

     

       11
       11
        
         (lib.optional (p ? float) "--with-float=${p.float}")

     

       12
       12
        
         (lib.optional (p ? mode) "--with-mode=${p.mode}")

     

       13
       13
       +
         (lib.optional

     

       14
       14
       +
           (let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit && tp.isLittleEndian)

     

       15
       15
       +
           "--with-long-double-128")

     

       13
       16
        
       ]

+18

pkgs/development/compilers/gcc/ppc-musl.patch

···

       1
       1
       +
       diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h

     

       2
       2
       +
       index cbee89140dd..e1f26b0a096 100644

     

       3
       3
       +
       --- a/gcc/config/rs6000/sysv4.h

     

       4
       4
       +
       +++ b/gcc/config/rs6000/sysv4.h

     

       5
       5
       +
       @@ -996,13 +996,7 @@ ncrtn.o%s"

     

       6
       6
       +
            { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\

     

       7
       7
       +
              GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },

     

       8
       8
       +
        

     

       9
       9
       +
       -#ifdef LOCAL_INCLUDE_DIR

     

       10
       10
       +
       -#define INCLUDE_DEFAULTS_MUSL_LOCAL			\

     

       11
       11
       +
       -    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\

     

       12
       12
       +
       -    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },

     

       13
       13
       +
       -#else

     

       14
       14
       +
        #define INCLUDE_DEFAULTS_MUSL_LOCAL

     

       15
       15
       +
       -#endif

     

       16
       16
       +
        

     

       17
       17
       +
        #ifdef PREFIX_INCLUDE_DIR

     

       18
       18
       +
        #define INCLUDE_DEFAULTS_MUSL_PREFIX			\

+9 -10

pkgs/development/compilers/ghc/8.0.2.nix

···

       102
       102
        
           done

     

       103
       103
        
           # GHC is a bit confused on its cross terminology, as these would normally be

     

       104
       104
        
           # the *host* tools.

     

       105
       105
       -
           export CC="$CC_FOR_TARGET"

     

       106
       106
       -
           export CXX="$CXX_FOR_TARGET"

     

       107
       107
       -
           # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177

     

       108
       108
       -
           export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"

     

       109
       109
       -
           export AS="$AS_FOR_TARGET"

     

       110
       110
       -
           export AR="$AR_FOR_TARGET"

     

       111
       111
       -
           export NM="$NM_FOR_TARGET"

     

       112
       112
       -
           export RANLIB="$RANLIB_FOR_TARGET"

     

       113
       113
       -
           export READELF="$READELF_FOR_TARGET"

     

       114
       114
       -
           export STRIP="$STRIP_FOR_TARGET"

     

       105
       105
       +
           export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"

     

       106
       106
       +
           export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"

     

       107
       107
       +
           export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld"

     

       108
       108
       +
           export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"

     

       109
       109
       +
           export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"

     

       110
       110
       +
           export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"

     

       111
       111
       +
           export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"

     

       112
       112
       +
           export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"

     

       113
       113
       +
           export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"

     

       115
       114
        
       

     

       116
       115
        
           echo -n "${buildMK}" > mk/build.mk

     

       117
       116
        
           sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure

+8 -8

pkgs/development/compilers/ghc/8.2.2.nix

···

       134
       134
        
           done

     

       135
       135
        
           # GHC is a bit confused on its cross terminology, as these would normally be

     

       136
       136
        
           # the *host* tools.

     

       137
       137
       -
           export CC="$CC_FOR_TARGET"

     

       138
       138
       -
           export CXX="$CXX_FOR_TARGET"

     

       137
       137
       +
           export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"

     

       138
       138
       +
           export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"

     

       139
       139
        
           # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177

     

       140
       140
        
           export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"

     

       141
       141
       -
           export AS="$AS_FOR_TARGET"

     

       142
       142
       -
           export AR="$AR_FOR_TARGET"

     

       143
       143
       -
           export NM="$NM_FOR_TARGET"

     

       144
       144
       -
           export RANLIB="$RANLIB_FOR_TARGET"

     

       145
       145
       -
           export READELF="$READELF_FOR_TARGET"

     

       146
       146
       -
           export STRIP="$STRIP_FOR_TARGET"

     

       141
       141
       +
           export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"

     

       142
       142
       +
           export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"

     

       143
       143
       +
           export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"

     

       144
       144
       +
           export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"

     

       145
       145
       +
           export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"

     

       146
       146
       +
           export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"

     

       147
       147
        
       

     

       148
       148
        
           echo -n "${buildMK}" > mk/build.mk

     

       149
       149
        
           sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure

+8 -8

pkgs/development/compilers/ghc/8.4.3.nix

···

       115
       115
        
           done

     

       116
       116
        
           # GHC is a bit confused on its cross terminology, as these would normally be

     

       117
       117
        
           # the *host* tools.

     

       118
       118
       -
           export CC="$CC_FOR_TARGET"

     

       119
       119
       -
           export CXX="$CXX_FOR_TARGET"

     

       118
       118
       +
           export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"

     

       119
       119
       +
           export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"

     

       120
       120
        
           # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177

     

       121
       121
        
           export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"

     

       122
       122
       -
           export AS="$AS_FOR_TARGET"

     

       123
       123
       -
           export AR="$AR_FOR_TARGET"

     

       124
       124
       -
           export NM="$NM_FOR_TARGET"

     

       125
       125
       -
           export RANLIB="$RANLIB_FOR_TARGET"

     

       126
       126
       -
           export READELF="$READELF_FOR_TARGET"

     

       127
       127
       -
           export STRIP="$STRIP_FOR_TARGET"

     

       122
       122
       +
           export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"

     

       123
       123
       +
           export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"

     

       124
       124
       +
           export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"

     

       125
       125
       +
           export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"

     

       126
       126
       +
           export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"

     

       127
       127
       +
           export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"

     

       128
       128
        
       

     

       129
       129
        
           echo -n "${buildMK}" > mk/build.mk

     

       130
       130
        
           sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure

+8 -8

pkgs/development/compilers/ghc/8.6.1.nix

···

       98
       98
        
           done

     

       99
       99
        
           # GHC is a bit confused on its cross terminology, as these would normally be

     

       100
       100
        
           # the *host* tools.

     

       101
       101
       -
           export CC="$CC_FOR_TARGET"

     

       102
       102
       -
           export CXX="$CXX_FOR_TARGET"

     

       101
       101
       +
           export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"

     

       102
       102
       +
           export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"

     

       103
       103
        
           # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177

     

       104
       104
        
           export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"

     

       105
       105
       -
           export AS="$AS_FOR_TARGET"

     

       106
       106
       -
           export AR="$AR_FOR_TARGET"

     

       107
       107
       -
           export NM="$NM_FOR_TARGET"

     

       108
       108
       -
           export RANLIB="$RANLIB_FOR_TARGET"

     

       109
       109
       -
           export READELF="$READELF_FOR_TARGET"

     

       110
       110
       -
           export STRIP="$STRIP_FOR_TARGET"

     

       105
       105
       +
           export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"

     

       106
       106
       +
           export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"

     

       107
       107
       +
           export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"

     

       108
       108
       +
           export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"

     

       109
       109
       +
           export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"

     

       110
       110
       +
           export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"

     

       111
       111
        
       

     

       112
       112
        
           echo -n "${buildMK}" > mk/build.mk

     

       113
       113
        
           sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure

+8 -8

pkgs/development/compilers/ghc/head.nix

···

       100
       100
        
           done

     

       101
       101
        
           # GHC is a bit confused on its cross terminology, as these would normally be

     

       102
       102
        
           # the *host* tools.

     

       103
       103
       -
           export CC="$CC_FOR_TARGET"

     

       104
       104
       -
           export CXX="$CXX_FOR_TARGET"

     

       103
       103
       +
           export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"

     

       104
       104
       +
           export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"

     

       105
       105
        
           # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177

     

       106
       106
        
           export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"

     

       107
       107
       -
           export AS="$AS_FOR_TARGET"

     

       108
       108
       -
           export AR="$AR_FOR_TARGET"

     

       109
       109
       -
           export NM="$NM_FOR_TARGET"

     

       110
       110
       -
           export RANLIB="$RANLIB_FOR_TARGET"

     

       111
       111
       -
           export READELF="$READELF_FOR_TARGET"

     

       112
       112
       -
           export STRIP="$STRIP_FOR_TARGET"

     

       107
       107
       +
           export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"

     

       108
       108
       +
           export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"

     

       109
       109
       +
           export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"

     

       110
       110
       +
           export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"

     

       111
       111
       +
           export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"

     

       112
       112
       +
           export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"

     

       113
       113
        
       

     

       114
       114
        
           echo -n "${buildMK}" > mk/build.mk

     

       115
       115
        
           echo ${version} >VERSION

-6

pkgs/development/compilers/openjdk/8.nix

···

       106
       106
        
           # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716

     

       107
       107
        
           + stdenv.lib.optionalString stdenv.cc.isGNU ''

     

       108
       108
        
             NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"

     

       109
       109
       -
           ''

     

       110
       110
       -
           # The configure script was confused by our passing these with full paths,

     

       111
       111
       -
           # so we explicitly override them to short variants.

     

       112
       112
       -
           + ''

     

       113
       113
       -
             CC=${stdenv.cc.targetPrefix}cc

     

       114
       114
       -
             CXX=${stdenv.cc.targetPrefix}c++

     

       115
       109
        
           '';

     

       116
       110
        
       

     

       117
       111
        
           configureFlags = [

-6

pkgs/development/interpreters/perl/default.nix

···

       97
       97
        
               sed -i 's,\(libswanted.*\)pthread,\1,g' Configure

     

       98
       98
        
             '';

     

       99
       99
        
       

     

       100
       100
       -
           preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))

     

       101
       101
       -
             ''

     

       102
       102
       -
               # Make Cwd work on NixOS (where we don't have a /bin/pwd).

     

       103
       103
       -
               substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"

     

       104
       104
       -
             '';

     

       105
       105
       -
       

     

       106
       100
        
           setupHook = ./setup-hook.sh;

     

       107
       101
        
       

     

       108
       102
        
           passthru.libPrefix = "lib/perl5/site_perl";

+2 -2

pkgs/development/libraries/audio/sratom/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.6.0";

     

       5
       5
       +
         version = "0.6.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://download.drobilla.net/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4";

     

       9
       9
       +
           sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+27 -4

pkgs/development/libraries/gcc/libgcc/default.nix

···

       46
       46
        
           mkdir -p "$buildRoot/gcc"

     

       47
       47
        
           cd "$buildRoot/gcc"

     

       48
       48
        
           (

     

       49
       49
       +
             export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD

     

       50
       50
       +
             export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD

     

       51
       51
       +
             export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD

     

       52
       52
       +
             export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD

     

       53
       53
       +
             export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD

     

       54
       54
       +
       

     

       49
       55
        
             export AS=$AS_FOR_BUILD

     

       50
       56
        
             export CC=$CC_FOR_BUILD

     

       51
       57
        
             export CPP=$CPP_FOR_BUILD

     

       52
       58
        
             export CXX=$CXX_FOR_BUILD

     

       53
       59
        
             export LD=$LD_FOR_BUILD

     

       54
       60
        
       

     

       55
       55
       -
             export AS_FOR_TARGET=$AS

     

       56
       56
       -
             export CC_FOR_TARGET=$CC

     

       57
       57
       -
             export CPP_FOR_TARGET=$CPP

     

       58
       58
       -
             export LD_FOR_TARGET=$LD

     

       61
       61
       +
             export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS

     

       62
       62
       +
             export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC

     

       63
       63
       +
             export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP

     

       64
       64
       +
             export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD

     

       59
       65
        
       

     

       60
       66
        
             export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1'

     

       61
       67
        
       

     
···

       81
       87
        
           cd "$buildRoot/gcc/${hostPlatform.config}/libgcc"

     

       82
       88
        
           configureScript=$sourceRoot/configure

     

       83
       89
        
           chmod +x "$configureScript"

     

       90
       90
       +
       

     

       91
       91
       +
           export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD

     

       92
       92
       +
           export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD

     

       93
       93
       +
           export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD

     

       94
       94
       +
           export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD

     

       95
       95
       +
           export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD

     

       96
       96
       +
       

     

       97
       97
       +
           export AS=${stdenvNoLibs.cc}/bin/$AS

     

       98
       98
       +
           export CC=${stdenvNoLibs.cc}/bin/$CC

     

       99
       99
       +
           export CPP=${stdenvNoLibs.cc}/bin/$CPP

     

       100
       100
       +
           export CXX=${stdenvNoLibs.cc}/bin/$CXX

     

       101
       101
       +
           export LD=${stdenvNoLibs.cc.bintools}/bin/$LD

     

       102
       102
       +
       

     

       103
       103
       +
           export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS_FOR_TARGET

     

       104
       104
       +
           export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC_FOR_TARGET

     

       105
       105
       +
           export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP_FOR_TARGET

     

       106
       106
       +
           export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET

     

       84
       107
        
         '';

     

       85
       108
        
       

     

       86
       109
        
         gccConfigureFlags = [

+2 -1

pkgs/development/libraries/kerberos/krb5.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds

     

       2
       2
       -
       , openssl, openldap, libedit

     

       2
       2
       +
       , openssl, openldap, libedit, keyutils

     

       3
       3
        
       

     

       4
       4
        
       # Extra Arguments

     

       5
       5
        
       , type ? ""

     
···

       40
       40
        
           # Provides the mig command used by the build scripts

     

       41
       41
        
           ++ optional stdenv.isDarwin bootstrap_cmds;

     

       42
       42
        
         buildInputs = [ openssl ]

     

       43
       43
       +
           ++ optionals (stdenv.hostPlatform.isLinux) [ keyutils ]

     

       43
       44
        
           ++ optionals (!libOnly) [ openldap libedit ];

     

       44
       45
        
       

     

       45
       46
        
         preConfigure = "cd ./src";

+2 -2

pkgs/development/libraries/libical/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

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

     

       6
       6
       -
         version = "3.0.3";

     

       6
       6
       +
         version = "3.0.4";

     

       7
       7
        
       

     

       8
       8
        
         outputs = [ "out" "dev" "devdoc" ];

     

       9
       9
        
       

     
···

       11
       11
        
           owner = "libical";

     

       12
       12
        
           repo = "libical";

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "0dhlfn6n136di4fbqd74gdaibyh5zz1vac5x8ii3bjc2d5h7hw8h";

     

       14
       14
       +
           sha256 = "1qgpbdjd6jsivw87v5w52268kqp0rv780kli8cgb3ndlv592wlbm";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [

-5

pkgs/development/libraries/podofo/default.nix

···

       19
       19
        
         # TODO(@Dridus) remove the ++ libc at next hash break

     

       20
       20
        
         buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;

     

       21
       21
        
       

     

       22
       22
       -
         preConfigure = ''

     

       23
       23
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       24
       24
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       25
       25
       -
         '';

     

       26
       26
       -
       

     

       27
       22
        
         cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";

     

       28
       23
        
       

     

       29
       24
        
         meta = {

+2 -2

pkgs/development/libraries/serd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.28.0";

     

       5
       5
       +
         version = "0.30.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://download.drobilla.net/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx";

     

       9
       9
       +
           sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig python ];

+2 -2

pkgs/development/libraries/sord/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

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

     

       5
       5
       -
         version = "0.16.0";

     

       5
       5
       +
         version = "0.16.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://download.drobilla.net/${name}.tar.bz2";

     

       9
       9
       -
           sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x";

     

       9
       9
       +
           sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+2 -2

pkgs/development/libraries/wayland/protocols.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "wayland-protocols-${version}";

     

       7
       7
       -
         version = "1.15";

     

       7
       7
       +
         version = "1.16";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys";

     

       11
       11
       +
           sha256 = "1icqikvhgv9kcf8lcqml3w9fb8q3igr4c3471jb6mlyw3yaqa53b";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkgconfig ];

-5

pkgs/development/libraries/zeroc-ice/default.nix

···

       27
       27
        
               --replace xcrun ""

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
       -
         preConfigure = ''

     

       31
       31
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       32
       32
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       33
       33
       -
         '';

     

       34
       34
       -
       

     

       35
       30
        
         makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ];

     

       36
       31
        
       

     

       37
       32
        
         enableParallelBuilding = true;

-3

pkgs/development/ocaml-modules/zarith/default.nix

···

       28
       28
        
         propagatedBuildInputs = [ gmp ];

     

       29
       29
        
       

     

       30
       30
        
         patchPhase = "patchShebangs ./z_pp.pl";

     

       31
       31
       -
       

     

       32
       31
        
         configurePhase = ''

     

       33
       33
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       34
       34
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       35
       32
        
           ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib

     

       36
       33
        
         '';

     

       37
       34
        
         preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib";

-5

pkgs/games/warmux/default.nix

···

       19
       19
        
             gettext intltool libtool perl

     

       20
       20
        
           ];

     

       21
       21
        
       

     

       22
       22
       -
         preConfigure = ''

     

       23
       23
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       24
       24
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       25
       25
       -
         '';

     

       26
       26
       -
       

     

       27
       22
        
         configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h");

     

       28
       23
        
       

     

       29
       24
        
         patches = [ ./gcc-fix.patch ];

-5

pkgs/games/warzone2100/default.nix

···

       30
       30
        
                             --replace "which %s" "${which}/bin/which %s"

     

       31
       31
        
         '';

     

       32
       32
        
       

     

       33
       33
       -
         preConfigure = ''

     

       34
       34
       -
           CC=${stdenv.cc.targetPrefix}cc

     

       35
       35
       -
           CXX=${stdenv.cc.targetPrefix}c++

     

       36
       36
       -
         '';

     

       37
       37
       -
       

     

       38
       33
        
         configureFlags = [ "--with-distributor=NixOS" ];

     

       39
       34
        
       

     

       40
       35
        
         hardeningDisable = [ "format" ];

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

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

     

       7
       7
       -
         version = "4.17.0";

     

       7
       7
       +
         version = "4.18.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";

     

       11
       11
       -
           sha256 = "0vmynikcamfhakvwyk5dsffy0ymgi5mdqiwybdvqfn1ijaq93abg";

     

       11
       11
       +
           sha256 = "0ida5njr9nacg6ym3rjvl3cc9czw0hn4akhzbqf8f4zmjl6cgrm9";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         preConfigure = ''

+7 -3

pkgs/os-specific/linux/kernel/manual-config.nix

···

       98
       98
        
                   sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g'

     

       99
       99
        
               done

     

       100
       100
        
               sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'

     

       101
       101
       +
               sed -i scripts/ld-version.sh -e "s|/usr/bin/awk|${buildPackages.gawk}/bin/awk|"

     

       101
       102
        
             '';

     

       102
       103
        
       

     

       103
       104
        
             configurePhase = ''

     
···

       145
       146
        
             ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware";

     

       146
       147
        
       

     

       147
       148
        
             # Some image types need special install targets (e.g. uImage is installed with make uinstall)

     

       148
       148
       -
             installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else

     

       149
       149
       -
                                 if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else

     

       150
       150
       -
                                 "install") ];

     

       149
       149
       +
             installTargets = [ (

     

       150
       150
       +
               if platform ? kernelInstallTarget then platform.kernelInstallTarget

     

       151
       151
       +
               else if platform.kernelTarget == "uImage" then "uinstall"

     

       152
       152
       +
               else if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall"

     

       153
       153
       +
               else "install"

     

       154
       154
       +
             ) ];

     

       151
       155
        
       

     

       152
       156
        
             postInstall = (optionalString installsFirmware ''

     

       153
       157
        
               mkdir -p $out/lib/firmware

+3 -2

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

···

       1
       1
       -
       { stdenv, lib, fetchurl

     

       1
       1
       +
       { stdenv, lib, fetchurl, hostPlatform

     

       2
       2
        
       , linuxHeaders ? null

     

       3
       3
        
       , useBSDCompatHeaders ? true

     

       4
       4
        
       }:

     
···

       61
       61
        
           configureFlagsArray+=("--syslibdir=$out/lib")

     

       62
       62
        
         '';

     

       63
       63
        
       

     

       64
       64
       +
         CFLAGS="-fstack-protector-strong" + lib.optionalString hostPlatform.isPower " -mlong-double-64";

     

       65
       65
       +
       

     

       64
       66
        
         configureFlags = [

     

       65
       67
        
           "--enable-shared"

     

       66
       68
        
           "--enable-static"

     

       67
       69
        
           "--enable-debug"

     

       68
       68
       -
           "CFLAGS=-fstack-protector-strong"

     

       69
       70
        
           "--enable-wrapper=all"

     

       70
       71
        
         ];

     

       71
       72

+3 -3

pkgs/servers/x11/xorg/default.nix

···

       740
       740
        
         }) // {inherit windowswmproto libX11 libXext xextproto ;};

     

       741
       741
        
       

     

       742
       742
        
         libX11 = (mkDerivation "libX11" {

     

       743
       743
       -
           name = "libX11-1.6.5";

     

       743
       743
       +
           name = "libX11-1.6.6";

     

       744
       744
        
           builder = ./builder.sh;

     

       745
       745
        
           src = fetchurl {

     

       746
       746
       -
             url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2;

     

       747
       747
       -
             sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d";

     

       746
       746
       +
             url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2;

     

       747
       747
       +
             sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5";

     

       748
       748
        
           };

     

       749
       749
        
           nativeBuildInputs = [ pkgconfig ];

     

       750
       750
        
           buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];

+1 -1

pkgs/servers/x11/xorg/tarballs-7.7.list

···

       60
       60
        
       mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2

     

       61
       61
        
       mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2

     

       62
       62
        
       mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2

     

       63
       63
       -
       mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2

     

       63
       63
       +
       mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2

     

       64
       64
        
       mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2

     

       65
       65
        
       mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2

     

       66
       66
        
       mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2

+1

pkgs/stdenv/default.nix

···

       47
       47
        
           "aarch64-linux" = stagesLinux;

     

       48
       48
        
           "mipsel-linux" = stagesLinux;

     

       49
       49
        
           "powerpc-linux" = /* stagesLinux */ stagesNative;

     

       50
       50
       +
           "powerpc64le-linux" = stagesLinux;

     

       50
       51
        
           "x86_64-darwin" = stagesDarwin;

     

       51
       52
        
           "x86_64-solaris" = stagesNix;

     

       52
       53
        
           "i686-cygwin" = stagesNative;

+3

pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh

···

       9
       9
        
       if test -f $out/lib/ld.so.?; then

     

       10
       10
        
          # MIPS case

     

       11
       11
        
          LD_BINARY=$out/lib/ld.so.?

     

       12
       12
       +
       elif test -f $out/lib/ld64.so.?; then

     

       13
       13
       +
          # ppc64(le)

     

       14
       14
       +
          LD_BINARY=$out/lib/ld64.so.?

     

       12
       15
        
       else

     

       13
       16
        
          # i686, x86_64 and armv5tel

     

       14
       17
        
          LD_BINARY=$out/lib/ld-*so.?

+4 -3

pkgs/stdenv/linux/default.nix

···

       16
       16
        
             "armv7l-linux" = import ./bootstrap-files/armv7l.nix;

     

       17
       17
        
             "aarch64-linux" = import ./bootstrap-files/aarch64.nix;

     

       18
       18
        
             "mipsel-linux" = import ./bootstrap-files/loongson2f.nix;

     

       19
       19
       +
             "powerpc64le-linux" = import ./bootstrap-files/ppc64le.nix;

     

       19
       20
        
           };

     

       20
       21
        
           "musl" = {

     

       21
       22
        
             "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix;

     

       22
       23
        
             "armv6l-linux"  = import ./bootstrap-files/armv6l-musl.nix;

     

       23
       24
        
             "x86_64-linux"  = import ./bootstrap-files/x86_64-musl.nix;

     

       25
       25
       +
             "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix;

     

       24
       26
        
           };

     

       25
       27
        
         };

     

       26
       28
        
         archLookupTable = table.${localSystem.libc}

     
···

       263
       265
        
             # because gcc (since JAR support) already depends on zlib, and

     

       264
       266
        
             # then if we already have a zlib we want to use that for the

     

       265
       267
        
             # other purposes (binutils and top-level pkgs) too.

     

       266
       266
       -
             inherit (prevStage) gettext gnum4 bison gmp perl zlib linuxHeaders;

     

       268
       268
       +
             inherit (prevStage) gettext gnum4 bison gmp perl texinfo zlib linuxHeaders;

     

       267
       269
        
             ${localSystem.libc} = getLibc prevStage;

     

       268
       270
        
             binutils = super.binutils.override {

     

       269
       271
        
               # Don't use stdenv's shell but our own

     
···

       344
       346
        
               concatMap (p: [ (getBin p) (getLib p) ])

     

       345
       347
        
                 [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils

     

       346
       348
        
                   gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl

     

       347
       347
       -
                   texinfo

     

       348
       349
        
                 ]

     

       349
       350
        
               # Library dependencies

     

       350
       351
        
               ++ map getLib (

     
···

       363
       364
        
               inherit (prevStage)

     

       364
       365
        
                 gzip bzip2 xz bash coreutils diffutils findutils gawk

     

       365
       366
        
                 gnumake gnused gnutar gnugrep gnupatch patchelf

     

       366
       366
       -
                 attr acl paxctl zlib pcre texinfo;

     

       367
       367
       +
                 attr acl paxctl zlib pcre;

     

       367
       368
        
               ${localSystem.libc} = getLibc prevStage;

     

       368
       369
        
             } // lib.optionalAttrs (super.targetPlatform == localSystem) {

     

       369
       370
        
               # Need to get rid of these when cross-compiling.

+15 -13

pkgs/stdenv/linux/make-bootstrap-tools-cross.nix

···

       5
       5
        
           localSystem = { inherit system; };

     

       6
       6
        
           inherit crossSystem;

     

       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;

     

       16
       16
       -
         x86_64-musl  = make musl64;

     

       17
       17
       -
         armv6l-musl  = make muslpi;

     

       18
       18
       -
         aarch64-musl = make aarch64-multiplatform-musl;

     

       19
       19
       -
         riscv64 = make riscv64;

     

       20
       20
       -
       }

     

       8
       8
       +
         lib = import ../../../lib;

     

       9
       9
       +
       in lib.mapAttrs (n: make) (with lib.systems.examples; {

     

       10
       10
       +
         armv5tel   = sheevaplug;

     

       11
       11
       +
         scaleway   = scaleway-c1;

     

       12
       12
       +
         pogoplug4  = pogoplug4;

     

       13
       13
       +
         armv6l     = raspberryPi;

     

       14
       14
       +
         armv7l     = armv7l-hf-multiplatform;

     

       15
       15
       +
         aarch64    = aarch64-multiplatform;

     

       16
       16
       +
         x86_64-musl  = musl64;

     

       17
       17
       +
         armv6l-musl  = muslpi;

     

       18
       18
       +
         aarch64-musl = aarch64-multiplatform-musl;

     

       19
       19
       +
         riscv64 = riscv64;

     

       20
       20
       +
         powerpc64le = powernv;

     

       21
       21
       +
         powerpc64le-musl = musl-power;

     

       22
       22
       +
       })

+1 -1

pkgs/tools/typesetting/tex/texlive/combine.nix

···

       203
       203
        
       

     

       204
       204
        
           perl `type -P mktexlsr.pl` ./share/texmf

     

       205
       205
        
           texlinks.sh "$out/bin" && wrapBin

     

       206
       206
       -
           (perl `type -P fmtutil.pl` --sys --refresh || true) | grep '^fmtutil' # too verbose

     

       206
       206
       +
           (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose

     

       207
       207
        
           #texlinks.sh "$out/bin" && wrapBin # do we need to regenerate format links?

     

       208
       208
        
           perl `type -P updmap.pl` --sys --syncwithtrees --force

     

       209
       209
        
           perl `type -P mktexlsr.pl` ./share/texmf-* # to make sure

+2 -1

pkgs/top-level/all-packages.nix

···

       14252
       14252
        
           kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod

     

       14253
       14253
        
         };

     

       14254
       14254
        
       

     

       14255
       14255
       -
         keyutils = callPackage ../os-specific/linux/keyutils { };

     

       14255
       14255
       +
         # Using fetchurlBoot because this is used by kerberos (on Linux), which curl depends on

     

       14256
       14256
       +
         keyutils = callPackage ../os-specific/linux/keyutils { fetchurl = fetchurlBoot; };

     

       14256
       14257
        
       

     

       14257
       14258
        
         libselinux = callPackage ../os-specific/linux/libselinux { };

     

       14258
       14259