commit b2dc75cd03dc6254a4df6d7fb8e3b41989f05a65 · pyrox.dev/nixpkgs

+6 -2

nixos/lib/qemu-flags.nix

···

       1
       1
        
       # QEMU flags shared between various Nix expressions.

     

       2
       2
        
       { pkgs }:

     

       3
       3
        
       

     

       4
       4
       +
       let

     

       5
       5
       +
         zeroPad = n: if n < 10 then "0${toString n}" else toString n;

     

       6
       6
       +
       in

     

       7
       7
       +
       

     

       4
       8
        
       {

     

       5
       9
        
       

     

       6
       10
        
         qemuNICFlags = nic: net: machine:

     

       7
       7
       -
           [ "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio"

     

       8
       8
       -
             "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}"

     

       11
       11
       +
           [ "-device virtio-net-pci,netdev=vlan${toString nic},mac=52:54:00:12:${zeroPad net}:${zeroPad machine}"

     

       12
       12
       +
             "-netdev vde,id=vlan${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}"

     

       9
       13
        
           ];

     

       10
       14
        
       

     

       11
       15
        
         qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"

+3 -1

nixos/tests/ec2.nix

···

       68
       68
        
                 # again when it deletes link-local addresses.) Ideally we'd

     

       69
       69
        
                 # turn off the DHCP server, but qemu does not have an option

     

       70
       70
        
                 # to do that.

     

       71
       71
       -
                 my $startCommand = "qemu-kvm -m 768 -net nic,vlan=0,model=virtio -net 'user,vlan=0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";

     

       71
       71
       +
                 my $startCommand = "qemu-kvm -m 768";

     

       72
       72
       +
                 $startCommand .= " -device virtio-net-pci,netdev=vlan0";

     

       73
       73
       +
                 $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";

     

       72
       74
        
                 $startCommand .= " -drive file=$diskImage,if=virtio,werror=report";

     

       73
       75
        
                 $startCommand .= " \$QEMU_OPTS";

     

       74
       76

+3 -4

pkgs/applications/virtualization/qemu/default.nix

···

       22
       22
        
       

     

       23
       23
        
       with stdenv.lib;

     

       24
       24
        
       let

     

       25
       25
       -
         version = "2.12.1";

     

       26
       26
       -
         sha256 = "1jp5y56682bgpfjapagxjfrjdvqkal34pj9qzn6kj8fqaad80l21";

     

       27
       25
        
         audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"

     

       28
       26
        
           + optionalString pulseSupport "pa,"

     

       29
       27
        
           + optionalString sdlSupport "sdl,";

     
···

       36
       34
        
       in

     

       37
       35
        
       

     

       38
       36
        
       stdenv.mkDerivation rec {

     

       37
       37
       +
         version = "3.0.0";

     

       39
       38
        
         name = "qemu-"

     

       40
       39
        
           + stdenv.lib.optionalString xenSupport "xen-"

     

       41
       40
        
           + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-"

     
···

       43
       42
        
           + version;

     

       44
       43
        
       

     

       45
       44
        
         src = fetchurl {

     

       46
       46
       -
           url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";

     

       47
       47
       -
           inherit sha256;

     

       45
       45
       +
           url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";

     

       46
       46
       +
           sha256 = "1s7bm2xhcxbc9is0rg8xzwijx7azv67skq7mjc58spsgc2nn4glk";

     

       48
       47
        
         };

     

       49
       48
        
       

     

       50
       49
        
         buildInputs =