diff options
| -rw-r--r-- | machines/aszlig/managed/tyree.nix | 4 | ||||
| -rw-r--r-- | pkgs/nixops/default.nix | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix index 46e567d2..c12d3f2d 100644 --- a/machines/aszlig/managed/tyree.nix +++ b/machines/aszlig/managed/tyree.nix @@ -4,7 +4,7 @@ boot.initrd.availableKernelModules = [ "usbhid" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.loader.gummiboot.enable = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; environment.systemPackages = with pkgs; [ @@ -44,7 +44,7 @@ networking.useNetworkd = true; nix.maxJobs = 4; - nix.useChroot = true; + nix.useSandbox = true; nix.readOnlyStore = true; nix.buildCores = 0; nix.extraOptions = '' diff --git a/pkgs/nixops/default.nix b/pkgs/nixops/default.nix index 85c3b6ae..e69a76aa 100644 --- a/pkgs/nixops/default.nix +++ b/pkgs/nixops/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, fetchpatch, git }: let - rev = "7c4659663722c05959f74db45e85073759a0b5ee"; - sha256 = "026jsp34fw199saqcfrixhcv53wkpc5y0vn57qx9wdyygjasibf8"; + rev = "e6f012a95988e52cc6555c04242056d319478b24"; + sha256 = "0xz1nz3a49vwhzkjb0b9c7c83iwfpkpvsnq5bpgm2w3qii75vhkj"; master = stdenv.mkDerivation rec { name = "nixops-upstream-patched"; @@ -18,9 +18,7 @@ let postPatch = '' sed -i -re 's!<nixpkgs([^>]*)>!${import ../../nixpkgs-path.nix}\1!g' \ release.nix doc/manual/default.nix doc/manual/resource.nix - # XXX: Hack to get it to build for now. - sed -i -e 's/pkgs\.libxslt/pkgs.libxslt.bin/g' \ - doc/manual/default.nix doc/manual/resource.nix + sed -i -e '/^docbookxsl/s/1\.78\.1/1.79.1/' doc/manual/Makefile ''; installPhase = '' |