Skip to content

Commit

Permalink
qemu: 2.11.0 -> 2.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@shlevy
shlevy committed Feb 18, 2018
1 parent 0ac5af9 commit ecf4825
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/qemu/default.nix
View file
Expand Up @@ -18,8 +18,8 @@

with stdenv.lib;
let
version = "2.11.0";
sha256 = "1jvzw6rdhimn583dz6an8xiw07n3ycvxmj3jpv1s312scv3k9w64";
version = "2.11.1";
sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
Expand Down

3 comments on commit ecf4825

@dtzWill
Copy link
Member

@dtzWill dtzWill commented on ecf4825 Feb 19, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May not be only due to this, but FWIW on latest master QEMU fails to build, giving this error:

$ nix build -f . qemu          18:32:18 on 18-02-18
builder for '/nix/store/kh6mdjljin4vcrsz198mk9dh2y089vx9-qemu-2.11.1.drv' failed with exit code 2; last 10 log lines:
  /build/qemu-2.11.1/linux-user/syscall_defs.h:2234:12: error: duplicate member 'f_frsize'
    int32_t   f_frsize;
              ^~~~~~~~
  /build/qemu-2.11.1/linux-user/syscall_defs.h:2278:11: error: duplicate member 'f_frsize'
    uint32_t f_frsize;
             ^~~~~~~~
  make[1]: *** [/build/qemu-2.11.1/rules.mak:66: exec.o] Error 1
  make: *** [Makefile:383: subdir-mipsn32-linux-user] Error 2
  make: *** Waiting for unfinished jobs....
  make: *** [Makefile:383: subdir-mipsn32el-linux-user] Error 2
[0 built (1 failed)]
error: build of '/nix/store/kh6mdjljin4vcrsz198mk9dh2y089vx9-qemu-2.11.1.drv' failed

Are you seeing this?

@shlevy
Copy link
Member Author

@shlevy shlevy commented on ecf4825 Feb 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm... I didn't hit this but it's certainly due to my patch. Checking...

@shlevy
Copy link
Member Author

@shlevy shlevy commented on ecf4825 Feb 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing a fix, sorry! I forgot that building kvm only built same-machine targets.

Please sign in to comment.