+1
-1
lib/systems/doubles.nix
+1
-1
lib/systems/for-meta.nix
+5
-2
lib/systems/inspect.nix
······
······
+1
-1
lib/systems/parse.nix
···
···
+1
-1
nixos/lib/qemu-flags.nix
+2
-2
nixos/modules/config/gnu.nix
+1
-1
nixos/modules/virtualisation/qemu-vm.nix
···(mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ])-(mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ])
···(mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ])+(mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ])
+1
-1
pkgs/applications/audio/sunvox/default.nix
+1
-1
pkgs/applications/networking/instant-messengers/toxic/default.nix
+3
-3
pkgs/applications/virtualization/qemu/default.nix
·········if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''-else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
·········if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''+else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+2
-2
pkgs/build-support/bintools-wrapper/default.nix
······
······
+1
-1
pkgs/development/compilers/gcc/4.8/default.nix
···
···+if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+1
-1
pkgs/development/compilers/gcc/4.9/default.nix
···
···+if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+1
-1
pkgs/development/compilers/gcc/5/default.nix
···
···+if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+1
-1
pkgs/development/compilers/gcc/6/default.nix
···
···+if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+1
-1
pkgs/development/compilers/gcc/7/default.nix
···
···+if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+1
-1
pkgs/development/compilers/gcc/snapshot/default.nix
···
···+if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+1
-1
pkgs/development/compilers/ghc/7.10.3-binary.nix
+1
-1
pkgs/development/compilers/ghc/8.2.1-binary.nix
···-buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ];
···+buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ];
+3
-3
pkgs/development/compilers/ghc/8.2.2.nix
······-export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"···
······+export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"···
+2
-2
pkgs/development/compilers/ghc/8.4.1.nix
···-export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"···
···+export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"···
+2
-2
pkgs/development/compilers/ghc/8.4.2.nix
···-export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"···
···+export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"···
+2
-2
pkgs/development/compilers/ghc/head.nix
···-export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"···
···+export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"···
+2
-2
pkgs/development/compilers/go/1.10.nix
······
······
+1
-1
pkgs/development/compilers/go/1.4.nix
···
···
+2
-2
pkgs/development/compilers/go/1.9.nix
······
······
+1
-1
pkgs/development/compilers/ocaml/3.12.1.nix
+1
-1
pkgs/development/compilers/ocaml/4.00.1.nix
+2
-2
pkgs/development/compilers/ocaml/generic.nix
······
······
+1
-1
pkgs/development/compilers/sbcl/bootstrap.nix
+1
-1
pkgs/development/compilers/sbcl/default.nix
+5
-5
pkgs/development/haskell-modules/configuration-common.nix
···-happy = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062-hashable = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95-servant-docs = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs;-servant-swagger = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger;-swagger2 = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
···+happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062+hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95+servant-docs = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs;+servant-swagger = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger;+swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
+1
-1
pkgs/development/haskell-modules/generic-builder.nix
···(optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")(optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")-(enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")(optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}")(enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
···(optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")(optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")+(enableFeature (enableDeadCodeElimination && !hostPlatform.isAarch32 && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")(optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}")(enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
+1
-1
pkgs/development/interpreters/perl/default.nix
···configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
···configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
+1
-1
pkgs/development/interpreters/picolisp/default.nix
+4
-4
pkgs/development/interpreters/spidermonkey/1.8.5.nix
·········url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e";···# hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
·········url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e";···# hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
+7
-7
pkgs/development/libraries/ffmpeg/generic.nix
·········-disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg;···-++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
·········+disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg;···+++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
+1
-1
pkgs/development/libraries/freetype/default.nix
+1
-1
pkgs/development/libraries/glibc/common.nix
+1
-1
pkgs/development/libraries/gmp/5.1.x.nix
+1
-1
pkgs/development/libraries/gmp/6.x.nix
+1
-1
pkgs/development/libraries/gnu-efi/default.nix
+1
-1
pkgs/development/libraries/icu/base.nix
···
···
+1
-1
pkgs/development/libraries/jemalloc/common.nix
···
···
+1
-1
pkgs/development/libraries/libdrm/default.nix
···
···
+1
-1
pkgs/development/libraries/libtoxcore/default.nix
+2
-2
pkgs/development/libraries/libtoxcore/new-api.nix
···
···
+1
-1
pkgs/development/libraries/libvpx/default.nix
+2
-2
pkgs/development/libraries/libvpx/git.nix
···
···
+3
-3
pkgs/development/libraries/mesa/default.nix
···
···
+1
-1
pkgs/development/libraries/pixman/default.nix
+1
-1
pkgs/development/libraries/pth/default.nix
+2
-2
pkgs/development/libraries/v8/3.16.14.nix
+1
-1
pkgs/development/libraries/v8/6_x.nix
+1
-1
pkgs/development/libraries/v8/default.nix
···
···
+1
-1
pkgs/development/libraries/webrtc-audio-processing/default.nix
···# signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode
···# signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode
+1
-1
pkgs/development/tools/misc/binutils/default.nix
···
···+if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+2
-2
pkgs/development/tools/misc/uhd/default.nix
···# /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1
···# /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1
+1
-1
pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
···
···
+1
-1
pkgs/os-specific/linux/kbd/default.nix
+1
-1
pkgs/os-specific/linux/kernel/common-config.nix
···
···
+1
-1
pkgs/os-specific/linux/systemd/default.nix
···-(if stdenv.isArm || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
···+(if stdenv.isAarch32 || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
+1
-1
pkgs/os-specific/linux/uclibc/default.nix
+1
-1
pkgs/servers/sql/mariadb/default.nix
+1
-1
pkgs/stdenv/generic/default.nix
···
+1
-1
pkgs/tools/networking/cjdns/default.nix
+1
-1
pkgs/tools/networking/filegive/default.nix
+1
-1
pkgs/tools/system/storebrowse/default.nix
+7
-7
pkgs/top-level/all-packages.nix
···-jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };-jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"···-jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };-jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"···
···+jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };+jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"···+jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };+jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"···