diff options
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/ranger/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 7 |
4 files changed, 9 insertions, 7 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5c4686044430..82b58aa67a3d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -77,14 +77,14 @@ let -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ ${if cfg.useBootLoader then '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=none,werror=report \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \ ${if cfg.useEFIBoot then '' -pflash $TMPDIR/bios.bin \ '' else '' ''} '' else '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=none,werror=report \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \ diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 5fcb028f0cd9..3c13623af948 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, w3m }: +{ stdenv, fetchurl, buildPythonPackage, python, w3m, file }: buildPythonPackage rec { name = "ranger-1.7.1"; @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q"; }; - propagatedBuildInputs = with python.modules; [ curses ]; + propagatedBuildInputs = [ python.modules.curses file ]; preConfigure = '' substituteInPlace ranger/ext/img_display.py \ diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 5ddfdc419179..1dee12ca12c0 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -119,4 +119,5 @@ mkDerivation (rec { license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; + broken = true; # depends on outdated versions of its Haskell build inputs }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0649ac42df40..98c8d3728a94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15263,11 +15263,12 @@ in modules // { }; pyglet = buildPythonPackage rec { - name = "pyglet-1.1.4"; + name = "pyglet-${version}"; + version = "1.2.4"; src = pkgs.fetchurl { - url = "http://pyglet.googlecode.com/files/${name}.tar.gz"; - sha256 = "048n20d606i3njnzhajadnznnfm8pwchs43hxs50da9p79g2m6qx"; + url = "https://pypi.python.org/packages/source/p/pyglet/pyglet-${version}.tar.gz"; + sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445"; }; patchPhase = let |