diff --git a/default.nix b/default.nix
index 507b838..e293789 100644
--- a/default.nix
+++ b/default.nix
@@ -1,12 +1,12 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "default"}:
+{ nixpkgs ? import <nixpkgs> { }, compiler ? "default" }:
 let
   inherit (nixpkgs) pkgs;
-  haskellPackages = if compiler == "default"
-                       then pkgs.haskellPackages
-                       else pkgs.haskell.packages.${compiler};
-  mcwhirter-io = haskellPackages.callPackage ./mcwhirter-io.nix {};
-in
-nixpkgs.stdenv.mkDerivation {
+  haskellPackages = if compiler == "default" then
+    pkgs.haskellPackages
+  else
+    pkgs.haskell.packages.${compiler};
+  mcwhirter-io = haskellPackages.callPackage ./mcwhirter-io.nix { };
+in nixpkgs.stdenv.mkDerivation {
   name = "mcwhirter-io-website";
   buildInputs = [ mcwhirter-io ];
   src = ./.;
diff --git a/nix/sources.nix b/nix/sources.nix
index 8a725cb..f69e4d9 100644
--- a/nix/sources.nix
+++ b/nix/sources.nix
@@ -19,29 +19,28 @@ let
       pkgs.fetchzip { inherit (spec) url sha256; };
 
   fetch_git = spec:
-    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
+    builtins.fetchGit {
+      url = spec.repo;
+      inherit (spec) rev ref;
+    };
 
   fetch_builtin-tarball = spec:
-    builtins.trace
-      ''
-        WARNING:
-          The niv type "builtin-tarball" will soon be deprecated. You should
-          instead use `builtin = true`.
+    builtins.trace ''
+      WARNING:
+        The niv type "builtin-tarball" will soon be deprecated. You should
+        instead use `builtin = true`.
 
-          $ niv modify <package> -a type=tarball -a builtin=true
-      ''
-      builtins_fetchTarball { inherit (spec) url sha256; };
+        $ niv modify <package> -a type=tarball -a builtin=true
+    '' builtins_fetchTarball { inherit (spec) url sha256; };
 
   fetch_builtin-url = spec:
-    builtins.trace
-      ''
-        WARNING:
-          The niv type "builtin-url" will soon be deprecated. You should
-          instead use `builtin = true`.
+    builtins.trace ''
+      WARNING:
+        The niv type "builtin-url" will soon be deprecated. You should
+        instead use `builtin = true`.
 
-          $ niv modify <package> -a type=file -a builtin=true
-      ''
-      (builtins_fetchurl { inherit (spec) url sha256; });
+        $ niv modify <package> -a type=file -a builtin=true
+    '' (builtins_fetchurl { inherit (spec) url sha256; });
 
   #
   # Various helpers
@@ -51,84 +50,84 @@ let
   mkPkgs = sources:
     let
       sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; })
+        { };
       hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
       hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
+    in if builtins.hasAttr "nixpkgs" sources then
+      sourcesNixpkgs
+    else if hasNixpkgsPath && !hasThisAsNixpkgsPath then
+      import <nixpkgs> { }
+    else
+      abort ''
+        Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+        add a package called "nixpkgs" to your sources.json.
+      '';
 
   # The actual fetching function.
   fetch = pkgs: name: spec:
 
-    if ! builtins.hasAttr "type" spec then
+    if !builtins.hasAttr "type" spec then
       abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs spec
-    else if spec.type == "tarball" then fetch_tarball pkgs spec
-    else if spec.type == "git" then fetch_git spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
-    else if spec.type == "builtin-url" then fetch_builtin-url spec
+    else if spec.type == "file" then
+      fetch_file pkgs spec
+    else if spec.type == "tarball" then
+      fetch_tarball pkgs spec
+    else if spec.type == "git" then
+      fetch_git spec
+    else if spec.type == "builtin-tarball" then
+      fetch_builtin-tarball spec
+    else if spec.type == "builtin-url" then
+      fetch_builtin-url spec
     else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+      abort
+      "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
 
   # Ports of functions for older nix versions
 
   # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
+  mapAttrs = builtins.mapAttrs or (f: set:
+    with builtins;
+    listToAttrs (map (attr: {
+      name = attr;
+      value = f attr set.${attr};
+    }) (attrNames set)));
 
   # fetchTarball version that is compatible between all the versions of Nix
   builtins_fetchTarball = { url, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchTarball { inherit url; }
-      else
-        fetchTarball attrs;
+    let inherit (builtins) lessThan nixVersion fetchTarball;
+    in if lessThan nixVersion "1.12" then
+      fetchTarball { inherit url; }
+    else
+      fetchTarball attrs;
 
   # fetchurl version that is compatible between all the versions of Nix
   builtins_fetchurl = { url, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchurl { inherit url; }
-      else
-        fetchurl attrs;
+    let inherit (builtins) lessThan nixVersion fetchurl;
+    in if lessThan nixVersion "1.12" then
+      fetchurl { inherit url; }
+    else
+      fetchurl attrs;
 
   # Create the final "sources" from the config
   mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = fetch config.pkgs name spec; }
-    ) config.sources;
+    mapAttrs (name: spec:
+      if builtins.hasAttr "outPath" spec then
+        abort
+        "The values in sources.json should not have an 'outPath' attribute"
+      else
+        spec // { outPath = fetch config.pkgs name spec; }) config.sources;
 
   # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? ./sources.json
+  mkConfig = { sourcesFile ? ./sources.json
     , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
-    , pkgs ? mkPkgs sources
-    }: rec {
+    , pkgs ? mkPkgs sources }: rec {
       # The sources, i.e. the attribute set of spec name to spec
       inherit sources;
 
       # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
       inherit pkgs;
     };
-in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
+in mkSources (mkConfig { }) // {
+  __functor = _: settings: mkSources (mkConfig settings);
+}
diff --git a/release.nix b/release.nix
index d6d07ee..78c4ce9 100644
--- a/release.nix
+++ b/release.nix
@@ -1,9 +1,5 @@
-let
-  sources = import ./nix/sources.nix;
-in
-{ compiler ? "ghc883"
-, pkgs ? import sources.nixpkgs { }
-}:
+let sources = import ./nix/sources.nix;
+in { compiler ? "ghc883", pkgs ? import sources.nixpkgs { } }:
 
 let
   inherit (pkgs.lib.trivial) flip pipe;
@@ -11,12 +7,10 @@ let
 
   haskellPackages = pkgs.haskell.packages.${compiler}.override {
     overrides = hpNew: hpOld: {
-      hakyll =
-        pipe
-           hpOld.hakyll
-           [ (flip appendPatch ./hakyll.patch)
-             (flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
-           ];
+      hakyll = pipe hpOld.hakyll [
+        (flip appendPatch ./hakyll.patch)
+        (flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
+      ];
 
       mcwhirter-io = hpNew.callCabal2nix "mcwhirter-io" ./. { };
 
@@ -25,21 +19,19 @@ let
   };
 
   project = haskellPackages.mcwhirter-io;
-in
-{
+in {
   project = project;
 
   shell = haskellPackages.shellFor {
-    packages = p: with p; [
-      project
-    ];
-    buildInputs = with haskellPackages; [
-      ghcid
-      hlint       # or ormolu
-      niv
-      pkgs.cacert # needed for niv
-      pkgs.nix    # needed for niv
-    ];
+    packages = p: with p; [ project ];
+    #buildInputs = with haskellPackages; [
+    #  ghcid
+    #  hlint       # or ormolu
+    #  niv
+    #  pkgs.cacert # needed for niv
+    #  pkgs.nix    # needed for niv
+    #  zlib
+    #];
     withHoogle = true;
   };
 }