Merge branch 'updates'

common.nix

@@ -10,7 +10,7 @@
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  nix.useChroot = true;
+  nix.useSandbox = true;
   nix.binaryCaches = [ https://cache.nixos.org ];
   nix.trustedBinaryCaches = [ https://cache.nixos.org ];
   nix.extraOptions = ''
@@ -96,13 +96,24 @@
     why3
     graphviz
     # toysolver
-    tip-lib
+    stable.haskellPackages.tip-lib
 
     coq_8_5
     emacsPackages.proofgeneral_4_3_pre
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
-  nixpkgs.config.packageOverrides = pkgs: rec {
+  nixpkgs.config.packageOverrides = pkgs: with pkgs; let
+    fetchNixPkgs = { rev, sha256 }:
+    fetchFromGitHub {
+      inherit sha256 rev;
+      owner = "NixOS";
+      repo = "nixpkgs-channels";
+    };
+    stable = import (fetchNixPkgs {
+      rev = "63b97855f15f5327565f6272def921b3203c8696";
+      sha256 = "1xhxrdpicdj73ff0vfjgyqkq9851cn9yh4c8pip3r2z4gff72jg6";
+    }) {};
+  in {
     idea.idea-community = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
         name = "idea-community-${version}";
         version = "2016.2.eap";
@@ -115,6 +126,8 @@
     neovim = pkgs.neovim.override {
       extraPythonPackages = [ pkgs.pythonPackages.websocket_client ];
     };
+
+    stable = stable;
   };
 
   nixpkgs.config.allowTexliveBuilds = true;

uefi.nix

@@ -2,7 +2,7 @@
 
 {
   # Use the gummiboot efi boot loader.
-  boot.loader.gummiboot.enable = true;
+  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   boot.initrd.kernelModules = [ "fbcon" ];