Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ce0d9d638ded
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4647755b9fd4
Choose a head ref
  • 20 commits
  • 81 files changed
  • 15 contributors

Commits on Apr 23, 2018

  1. libgpg-error: 1.27 -> 1.28

    (cherry picked from commit 380171c)
    shlevy authored and flokli committed Apr 23, 2018
    Copy the full SHA
    d6cfc78 View commit details
  2. libgpg-error: fix on ARM

    (cherry picked from commit 7a77439)
    abbradar authored and flokli committed Apr 23, 2018
    Copy the full SHA
    a0bd25d View commit details
  3. gpgme: 1.10.0 -> 1.11.1

    I've rebuild all packages that depend on gpgme and everything seems fine
    so far (there are a few failures but the ones I've checked are unrelated
    to gpgme).
    
    Upstream release notes (Noteworthy changes in version 1.11.1):
    
     * Fixed build problems in the 1.11.0 release.
    
     * Added C++ interfaces which were planned for 1.11.0.
    
     The 1.11.0 release came with these changes:
    
     * New encryption API to support direct key specification including
       hidden recipients option and taking keys from a file.  This also
       allows to enforce the use of a subkey.
    
     * New encryption flag for the new API to enforce the use of plain
       mail addresses (addr-spec).
    
     * The import API can now tell whether v3 keys are skipped.  These old
       and basically broken keys are not anymore supported by GnuPG 2.1.
    
     * The decrypt and verify API will now return the MIME flag as
       specified by RFC-4880bis.
    
     * The offline mode now has an effect on gpg by disabling all network
       access.  [#3831]
    
     * A failed OpenPGP verification how returns the fingerprint of the
       intended key if a recent gpg version was used for signature
       creation.
    
     * New tool gpgme-json as native messaging server for web browsers.
       As of now public key encryption and decryption is supported.
       Requires Libgpg-error 1.29.
    
     * New context flag "request-origin" which has an effect when used
       with GnuPG 2.2.6 or later.
    
     * New context flag "no-symkey-cache" which has an effect when used
       with GnuPG 2.2.7 or later.
    
     * New convenience constant GPGME_KEYLIST_MODE_LOCATE.
    
     * Improved the Python documentation.
    
     * Fixed a potential regression with GnuPG 2.2.6 or later.
    
     * Fixed a crash in the Python bindings on 32 bit platforms.  [#3892]
    
     * Various minor fixes.
    
    (cherry picked from commit f76c842)
    primeos authored and flokli committed Apr 23, 2018
    Copy the full SHA
    2f680ff View commit details
  4. systemd: cherry-pick 848e863acc51ecfb0f3955c498874588201d9130

    fixes build after bump of libgpg-error from 1.27 to 1.28.
    flokli committed Apr 23, 2018
    Copy the full SHA
    00dca0e View commit details

Commits on Apr 24, 2018

  1. Merge pull request #39369 from flokli/notmuch-18.03

    gpgme: 1.10.0 -> 1.11.1
    Mic92 authored Apr 24, 2018
    Copy the full SHA
    df29e69 View commit details

Commits on Apr 25, 2018

  1. notmuch: 0.26 -> 0.26.1

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/notmuch/versions.
    
    These checks were done:
    
    - built on NixOS
    - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch --help’ got 0 exit code
    - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch help’ got 0 exit code
    - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch --version’ and found version 0.26.1
    - found 0.26.1 with grep in /nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1
    - directory tree listing: https://gist.github.com/adeae189f9ac416571a7c0e3beca712f
    R. RyanTM authored and bfortz committed Apr 25, 2018
    Copy the full SHA
    35f3da5 View commit details
  2. notmuch: fix /bin/sh impurity in ./configure

    (cherry picked from commit d974161)
    hedning authored and flokli committed Apr 25, 2018
    Copy the full SHA
    a9252c6 View commit details
  3. treewide: isArm -> isAarch32

    Following legacy packing conventions, `isArm` was defined just for
    32-bit ARM instruction set. This is confusing to non packagers though,
    because Aarch64 is an ARM instruction set.
    
    The official ARM overview for ARMv8[1] is surprisingly not confusing,
    given the overall state of affairs for ARM naming conventions, and
    offers us a solution. It divides the nomenclature into three levels:
    
    ```
    ISA:             ARMv8   {-A, -R, -M}
                     /    \
    Mode:     Aarch32     Aarch64
                 |         /   \
    Encoding:   A64      A32   T32
    ```
    
    At the top is the overall v8 instruction set archicture. Second are the
    two modes, defined by bitwidth but differing in other semantics too, and
    buttom are the encodings, (hopefully?) isomorphic if they encode the
    same mode.
    
    The 32 bit encodings are mostly backwards compatible with previous
    non-Thumb and Thumb encodings, and if so we can pun the mode names to
    instead mean "sets of compatable or isomorphic encodings", and then
    voilà we have nice names for 32-bit and 64-bit arm instruction sets
    which do not use the word ARM so as to not confused either laymen or
    experienced ARM packages.
    
    [1]: https://developer.arm.com/products/architecture/a-profile
    
    (cherry picked from commit ba52ae5)
    Ericson2314 committed Apr 25, 2018
    Copy the full SHA
    b9acfb4 View commit details
  4. Copy the full SHA
    2cbb138 View commit details
  5. Merge pull request #39481 from flokli/notmuch-18.03-patch-shebangs

    notmuch: add missing "patchShebangs configure"
    Mic92 authored Apr 25, 2018
    Copy the full SHA
    71bf440 View commit details
  6. Copy the full SHA
    dc3dc33 View commit details

Commits on Apr 30, 2018

  1. dbeaver: 5.0.3 -> 5.0.4

    (cherry picked from commit d0c8bf8)
    samueldr committed Apr 30, 2018
    Copy the full SHA
    fd6d360 View commit details
  2. Merge pull request #39703 from samueldr/dbeaver/18.03/5.0.4

    dbeaver: 5.0.3 -> 5.0.4 (18.03)
    Mic92 authored Apr 30, 2018
    Copy the full SHA
    27c6eaa View commit details
  3. linux: 4.4.129 -> 4.4.130

    (cherry picked from commit d5eef36)
    NeQuissimus committed Apr 30, 2018
    Copy the full SHA
    df4afa8 View commit details
  4. linux: 4.9.96 -> 4.9.97

    (cherry picked from commit 24a7d14)
    NeQuissimus committed Apr 30, 2018
    Copy the full SHA
    26a6b4d View commit details
  5. linux: 4.14.37 -> 4.14.38

    (cherry picked from commit 6cbded6)
    NeQuissimus committed Apr 30, 2018
    Copy the full SHA
    bafd695 View commit details

Commits on May 1, 2018

  1. xmlformat: init at 1.04

    (cherry picked from commit 07c0254)
    grahamc committed May 1, 2018
    Copy the full SHA
    00e6e39 View commit details
  2. Merge pull request #39787 from obsidiansystems/aarch32-for-18.03

     treewide: isArm -> isAarch32
    Ericson2314 authored May 1, 2018
    Copy the full SHA
    e1c7e99 View commit details
  3. Copy the full SHA
    4c36c0a View commit details
  4. nixos-install manual: remove --chroot option

    This option has been removed from the tool in favour of nixos-enter.
    
    (cherry picked from commit 152454d)
    lheckemann authored and Mic92 committed May 1, 2018
    Copy the full SHA
    4647755 View commit details
Showing with 178 additions and 196 deletions.
  1. +1 −1 lib/systems/doubles.nix
  2. +1 −1 lib/systems/for-meta.nix
  3. +5 −2 lib/systems/inspect.nix
  4. +1 −1 lib/systems/parse.nix
  5. +0 −11 nixos/doc/manual/man-nixos-install.xml
  6. +1 −1 nixos/lib/qemu-flags.nix
  7. +2 −2 nixos/modules/config/gnu.nix
  8. +1 −1 nixos/modules/virtualisation/qemu-vm.nix
  9. +1 −1 pkgs/applications/audio/sunvox/default.nix
  10. +2 −2 pkgs/applications/misc/dbeaver/default.nix
  11. +1 −1 pkgs/applications/networking/browsers/firefox/packages.nix
  12. +1 −1 pkgs/applications/networking/instant-messengers/toxic/default.nix
  13. +4 −2 pkgs/applications/networking/mailreaders/notmuch/default.nix
  14. +3 −3 pkgs/applications/virtualization/qemu/default.nix
  15. +2 −2 pkgs/build-support/bintools-wrapper/default.nix
  16. +1 −1 pkgs/development/compilers/gcc/4.5/default.nix
  17. +1 −1 pkgs/development/compilers/gcc/4.8/default.nix
  18. +1 −1 pkgs/development/compilers/gcc/4.9/default.nix
  19. +1 −1 pkgs/development/compilers/gcc/5/default.nix
  20. +1 −1 pkgs/development/compilers/gcc/6/default.nix
  21. +1 −1 pkgs/development/compilers/gcc/7/default.nix
  22. +1 −1 pkgs/development/compilers/gcc/snapshot/default.nix
  23. +1 −1 pkgs/development/compilers/ghc/7.10.3-binary.nix
  24. +1 −1 pkgs/development/compilers/ghc/8.2.1-binary.nix
  25. +3 −3 pkgs/development/compilers/ghc/8.2.2.nix
  26. +2 −2 pkgs/development/compilers/ghc/8.4.1.nix
  27. +2 −2 pkgs/development/compilers/ghc/head.nix
  28. +2 −2 pkgs/development/compilers/go/1.10.nix
  29. +1 −1 pkgs/development/compilers/go/1.4.nix
  30. +2 −2 pkgs/development/compilers/go/1.9.nix
  31. +1 −1 pkgs/development/compilers/ocaml/3.12.1.nix
  32. +1 −1 pkgs/development/compilers/ocaml/4.00.1.nix
  33. +2 −2 pkgs/development/compilers/ocaml/generic.nix
  34. +1 −1 pkgs/development/compilers/sbcl/bootstrap.nix
  35. +1 −1 pkgs/development/compilers/sbcl/default.nix
  36. +5 −5 pkgs/development/haskell-modules/configuration-common.nix
  37. +1 −1 pkgs/development/haskell-modules/generic-builder.nix
  38. +1 −1 pkgs/development/interpreters/perl/default.nix
  39. +1 −1 pkgs/development/interpreters/picolisp/default.nix
  40. +4 −4 pkgs/development/interpreters/spidermonkey/1.8.5.nix
  41. +7 −7 pkgs/development/libraries/ffmpeg/generic.nix
  42. +1 −1 pkgs/development/libraries/freetype/default.nix
  43. +1 −1 pkgs/development/libraries/glibc/common-2.27.nix
  44. +1 −1 pkgs/development/libraries/glibc/common.nix
  45. +1 −1 pkgs/development/libraries/gmp/5.1.x.nix
  46. +1 −1 pkgs/development/libraries/gmp/6.x.nix
  47. +1 −1 pkgs/development/libraries/gnu-efi/default.nix
  48. +3 −2 pkgs/development/libraries/gpgme/default.nix
  49. +1 −1 pkgs/development/libraries/icu/base.nix
  50. +1 −1 pkgs/development/libraries/jemalloc/default.nix
  51. +1 −1 pkgs/development/libraries/libdrm/default.nix
  52. +14 −8 pkgs/development/libraries/libgpg-error/default.nix
  53. +0 −54 pkgs/development/libraries/libgpg-error/riscv.patch
  54. +1 −1 pkgs/development/libraries/libtoxcore/default.nix
  55. +2 −2 pkgs/development/libraries/libtoxcore/new-api.nix
  56. +1 −1 pkgs/development/libraries/libvpx/default.nix
  57. +2 −2 pkgs/development/libraries/libvpx/git.nix
  58. +3 −3 pkgs/development/libraries/mesa/default.nix
  59. +1 −1 pkgs/development/libraries/pixman/default.nix
  60. +1 −1 pkgs/development/libraries/pth/default.nix
  61. +2 −2 pkgs/development/libraries/v8/3.16.14.nix
  62. +1 −1 pkgs/development/libraries/v8/6_x.nix
  63. +1 −1 pkgs/development/libraries/v8/default.nix
  64. +1 −1 pkgs/development/libraries/webrtc-audio-processing/default.nix
  65. +1 −1 pkgs/development/python-modules/Cython/default.nix
  66. +1 −1 pkgs/development/tools/misc/binutils/2.30.nix
  67. +1 −1 pkgs/development/tools/misc/binutils/default.nix
  68. +1 −1 pkgs/os-specific/linux/kbd/default.nix
  69. +1 −1 pkgs/os-specific/linux/kernel/common-config.nix
  70. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  71. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  72. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  73. +6 −1 pkgs/os-specific/linux/systemd/default.nix
  74. +1 −1 pkgs/os-specific/linux/uclibc/default.nix
  75. +1 −1 pkgs/servers/sql/mariadb/default.nix
  76. +1 −1 pkgs/stdenv/generic/default.nix
  77. +1 −1 pkgs/tools/networking/cjdns/default.nix
  78. +1 −1 pkgs/tools/networking/filegive/default.nix
  79. +1 −1 pkgs/tools/system/storebrowse/default.nix
  80. +28 −0 pkgs/tools/text/xml/xmlformat/default.nix
  81. +13 −11 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion lib/systems/doubles.nix
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ in rec {

none = [];

arm = filterDoubles predicates.isArm;
arm = filterDoubles predicates.isAarch32;
aarch64 = filterDoubles predicates.isAarch64;
x86 = filterDoubles predicates.isx86;
i686 = filterDoubles predicates.isi686;
2 changes: 1 addition & 1 deletion lib/systems/for-meta.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ in rec {
all = [ {} ]; # `{}` matches anything
none = [];

arm = [ patterns.isArm ];
arm = [ patterns.isAarch32 ];
aarch64 = [ patterns.isAarch64 ];
x86 = [ patterns.isx86 ];
i686 = [ patterns.isi686 ];
7 changes: 5 additions & 2 deletions lib/systems/inspect.nix
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ rec {
isx86_64 = { cpu = cpuTypes.x86_64; };
isPowerPC = { cpu = cpuTypes.powerpc; };
isx86 = { cpu = { family = "x86"; }; };
isArm = { cpu = { family = "arm"; }; };
isAarch64 = { cpu = { family = "aarch64"; }; };
isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
isMips = { cpu = { family = "mips"; }; };
isRiscV = { cpu = { family = "riscv"; }; };
isWasm = { cpu = { family = "wasm"; }; };
@@ -43,6 +43,9 @@ rec {
[ "x86" "arm" "aarch64" ];
isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
[ "x86" "arm" "aarch64" "mips" ];

# Deprecated after 18.03
isArm = isAarch32;
};

matchAnyAttrs = patterns:
2 changes: 1 addition & 1 deletion lib/systems/parse.nix
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ rec {
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
11 changes: 0 additions & 11 deletions nixos/doc/manual/man-nixos-install.xml
Original file line number Diff line number Diff line change
@@ -57,9 +57,6 @@
<arg>
<arg choice='plain'><option>--show-trace</option></arg>
</arg>
<arg>
<arg choice='plain'><option>--chroot</option></arg>
</arg>
<arg>
<arg choice='plain'><option>--help</option></arg>
</arg>
@@ -177,14 +174,6 @@ it.</para>
</listitem>
</varlistentry>

<varlistentry>
<term><option>--chroot</option></term>
<listitem>
<para>Chroot into given installation. Any additional arguments passed are going to be executed inside the chroot.
</para>
</listitem>
</varlistentry>

<varlistentry>
<term><option>--help</option></term>
<listitem>
2 changes: 1 addition & 1 deletion nixos/lib/qemu-flags.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
];

qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"
else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0"
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";

qemuBinary = qemuPkg: {
4 changes: 2 additions & 2 deletions nixos/modules/config/gnu.nix
Original file line number Diff line number Diff line change
@@ -26,11 +26,11 @@ with lib;
nano zile
texinfo # for the stand-alone Info reader
]
++ stdenv.lib.optional (!stdenv.isArm) grub2;
++ stdenv.lib.optional (!stdenv.isAarch32) grub2;


# GNU GRUB, where available.
boot.loader.grub.enable = !pkgs.stdenv.isArm;
boot.loader.grub.enable = !pkgs.stdenv.isAarch32;
boot.loader.grub.version = 2;

# GNU lsh.
2 changes: 1 addition & 1 deletion nixos/modules/virtualisation/qemu-vm.nix
Original file line number Diff line number Diff line change
@@ -437,7 +437,7 @@ in
# FIXME: Consolidate this one day.
virtualisation.qemu.options = mkMerge [
(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.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ])
];

# Mount the host filesystem via 9P, and bind-mount the Nix store
2 changes: 1 addition & 1 deletion pkgs/applications/audio/sunvox/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ let
arch =
if stdenv.isAarch64
then "arm64"
else if stdenv.isArm
else if stdenv.isAarch32
then "arm_armhf_raspberry_pi"
else if stdenv.is64bit
then "x86_64"
4 changes: 2 additions & 2 deletions pkgs/applications/misc/dbeaver/default.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

stdenv.mkDerivation rec {
name = "dbeaver-ce-${version}";
version = "5.0.3";
version = "5.0.4";

desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "0pk40jzmd23cv690a8wslxbb4xp4msq2zwh7xm0hvs64ykm9a581";
sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3";
};

installPhase = ''
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ rec {
]
# The following patch is only required on ARM platforms and should be
# included for the next ESR release >= 52.7.3esr
++ lib.optional stdenv.isArm
++ lib.optional stdenv.isAarch32
(fetchpatch {
name = "CVE-2018-5147-tremor.patch";
url = https://hg.mozilla.org/releases/mozilla-esr52/rev/5cd5586a2f48;
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

buildInputs = [
libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
] ++ stdenv.lib.optionals (!stdenv.isArm) [
] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
openal libopus libvpx freealut libqrencode
];
nativeBuildInputs = [ pkgconfig libconfig ];
6 changes: 4 additions & 2 deletions pkgs/applications/networking/mailreaders/notmuch/default.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "0.26";
version = "0.26.1";
name = "notmuch-${version}";

passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k";
sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk";
};

nativeBuildInputs = [ pkgconfig ];
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies

postPatch = ''
patchShebangs configure
find test/ -type f -exec \
sed -i \
-e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
6 changes: 3 additions & 3 deletions pkgs/applications/virtualization/qemu/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, makeWrapper
, attr, libcap, libcap_ng
, CoreServices, Cocoa, rez, setfile
, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
, seccompSupport ? stdenv.isLinux, libseccomp
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
, sdlSupport ? !stdenv.isDarwin, SDL
@@ -26,7 +26,7 @@ let

hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu"
else if stdenv.isi686 then "i386-softmmu"
else if stdenv.isArm then "arm-softmmu"
else if stdenv.isAarch32 then "arm-softmmu"
else if stdenv.isAarch64 then "aarch64-softmmu"
else throw "Don't know how to build a 'hostCpuOnly = true' QEMU";
in
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
postInstall =
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.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)"''
else "";

4 changes: 2 additions & 2 deletions pkgs/build-support/bintools-wrapper/default.nix
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ let
else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2"
else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2"
# ARM with a wildcard, which can be "" or "-armhf".
else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3"
else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3"
else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1"
else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1"
else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1"
@@ -174,7 +174,7 @@ stdenv.mkDerivation {
sep = optionalString (!targetPlatform.isMips) "-";
arch =
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
else if targetPlatform.isArm then endianPrefix + "arm"
else if targetPlatform.isAarch32 then endianPrefix + "arm"
else if targetPlatform.isx86_64 then "x86-64"
else if targetPlatform.isi686 then "i386"
else if targetPlatform.isMips then {
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/4.5/default.nix
Original file line number Diff line number Diff line change
@@ -258,7 +258,7 @@ stdenv.mkDerivation ({
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/4.8/default.nix
Original file line number Diff line number Diff line change
@@ -300,7 +300,7 @@ stdenv.mkDerivation ({
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/4.9/default.nix
Original file line number Diff line number Diff line change
@@ -309,7 +309,7 @@ stdenv.mkDerivation ({
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/5/default.nix
Original file line number Diff line number Diff line change
@@ -329,7 +329,7 @@ stdenv.mkDerivation ({
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/6/default.nix
Original file line number Diff line number Diff line change
@@ -333,7 +333,7 @@ stdenv.mkDerivation ({
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/7/default.nix
Original file line number Diff line number Diff line change
@@ -329,7 +329,7 @@ stdenv.mkDerivation ({
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/snapshot/default.nix
Original file line number Diff line number Diff line change
@@ -301,7 +301,7 @@ stdenv.mkDerivation ({
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/7.10.3-binary.nix
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
or (throw "cannot bootstrap GHC on this platform"));

nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ];
buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ];

# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.2.1-binary.nix
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
or (throw "cannot bootstrap GHC on this platform"));

nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ];
buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ];

# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
6 changes: 3 additions & 3 deletions pkgs/development/compilers/ghc/8.2.2.nix
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
enableShared ?
!(targetPlatform.isDarwin
# On iOS, dynamic linking is not supported
&& (targetPlatform.isAarch64 || targetPlatform.isArm))
&& (targetPlatform.isAarch64 || targetPlatform.isAarch32))
, # Whether to backport https://phabricator.haskell.org/D4388 for
# deterministic profiling symbol names, at the cost of a slightly
# non-standard GHC API
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
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"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ stdenv.lib.optionals (targetPlatform.isArm) [
] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
"CFLAGS=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
4 changes: 2 additions & 2 deletions pkgs/development/compilers/ghc/8.4.1.nix
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
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"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ stdenv.lib.optionals (targetPlatform.isArm) [
] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
"CFLAGS=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
4 changes: 2 additions & 2 deletions pkgs/development/compilers/ghc/head.nix
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
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"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ stdenv.lib.optionals (targetPlatform.isArm) [
] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
"CFLAGS=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
4 changes: 2 additions & 2 deletions pkgs/development/compilers/go/1.10.nix
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
'' + optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
'' + optionalString stdenv.isArm ''
'' + optionalString stdenv.isAarch32 ''
sed -i '/TestCurrent/areturn' src/os/user/user_test.go
echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
'' + optionalString stdenv.isDarwin ''
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
GOARCH = if stdenv.isDarwin then "amd64"
else if stdenv.system == "i686-linux" then "386"
else if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.isArm then "arm"
else if stdenv.isAarch32 then "arm"
else if stdenv.isAarch64 then "arm64"
else throw "Unsupported system";
GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
2 changes: 1 addition & 1 deletion pkgs/development/compilers/go/1.4.nix
Original file line number Diff line number Diff line change
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
GOARCH = if stdenv.isDarwin then "amd64"
else if stdenv.system == "i686-linux" then "386"
else if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.isArm then "arm"
else if stdenv.isAarch32 then "arm"
else throw "Unsupported system";
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
GO386 = 387; # from Arch: don't assume sse2 on i686
Loading