Skip to content
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
base: 80b7298420f0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8b6fe6680f4d
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Apr 25, 2018

  1. qemu: 2.11.1 -> 2.12.0

    xeji committed Apr 25, 2018
    Copy the full SHA
    3e3b39f View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2018

  1. qemu: workaround 'struct sysinfo' conflict musl <--> linux

    Most everyone using musl patches the linux headers instead,
    but various software uses a local workaround like the
    one added in this commit (psutils, for example).
    
    It's not obvious to me which project has the "bug",
    and I'm reluctant to even propose modifying our headers
    without clear answer on the issue.
    
    Also, modifying those headers triggers rebuild-all-the-things.
    
    Hopefully upstream projects sort this out, in the meantime
    adding this define is a bit of a kludge but does the job.
    
    -------
    
    For the curious, the patch usually is something like this:
    https://patchwork.kernel.org/patch/3833241/
    
    Here's an updated version that also ensures
    kernel users get the sysinfo struct as expected too:
    https://raw.githubusercontent.com/openwrt/openwrt/e3c43ade0bae9491aeea50fa361e846bb5002dc0/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch
    
    (cherry picked from commit dtzWill/nixpkgs@91b5f5a)
    dtzWill authored and xeji committed Apr 26, 2018
    Copy the full SHA
    3d4aa7e View commit details
    Browse the repository at this point in the history
  2. qemu-riscv: remove, obsolete with qemu 2.12

    upstream qemu 2.12 includes riscv support
    xeji committed Apr 26, 2018
    Copy the full SHA
    00610fe View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2018

  1. Merge pull request #39513 from xeji/qemu-2-12

    qemu: 2.11.1 -> 2.12.0
    xeji committed Apr 29, 2018
    Copy the full SHA
    8b6fe66 View commit details
    Browse the repository at this point in the history