Clean up Nix setup

Author: owickstrom

.gitignore

@@ -9,3 +9,4 @@ cabal.project.local
 .DS_Store
 *.swp
 *.keter
+/result

default.nix

@@ -1,9 +1,8 @@
-{ nixpkgs ? import <nixpkgs> {}
-, compiler ? "ghc865"
+{ pkgs ? import <nixpkgs> {}
+, compiler ? "ghc884"
 , doCheck ? true
 }:
 let
-  inherit (nixpkgs) pkgs;
   haskellPackages = pkgs.haskell.packages.${compiler}.override {
     overrides = self: super: {
     };

pandoc-include-code.cabal

@@ -36,7 +36,7 @@ library
                    , filepath
                    , text                 >= 1.2      && < 2
                    , mtl                  >= 2.2      && < 3
-                   , pandoc-types         >= 1.22     && <= 1.22
+                   , pandoc-types         >= 1.20     && <= 1.22
                    , containers
 
 
@@ -45,7 +45,7 @@ executable pandoc-include-code
     main-is:         Main.hs
     other-modules:   Paths_pandoc_include_code
     build-depends:   base                 >= 4        && < 5
-                   , pandoc-types         >= 1.22     && <= 1.22
+                   , pandoc-types         >= 1.20     && <= 1.22
                    , pandoc-include-code
 
 test-suite filter-tests
@@ -55,7 +55,7 @@ test-suite filter-tests
                    , Paths_pandoc_include_code
     main-is:         Driver.hs
     build-depends:   base                 >= 4        && < 5
-                   , pandoc-types         >= 1.22     && <= 1.22
+                   , pandoc-types         >= 1.20     && <= 1.22
                    , pandoc-include-code
                    , tasty
                    , tasty-hunit

shell.nix

@@ -1,10 +1,10 @@
-{ nixpkgs ? import <nixpkgs> {}
-, compiler ? "ghc865"
-}:
-nixpkgs.pkgs.haskellPackages.shellFor {
+{ pkgs ? import <nixpkgs> { }, compiler ? "ghc884" }:
+let
+  haskellPackages = pkgs.haskell.packages.${compiler}.override {
+    overrides = self: super: { };
+  };
+in haskellPackages.shellFor {
   withHoogle = true;
-  packages = p: [(import ./. {inherit compiler nixpkgs;})];
-  buildInputs = with nixpkgs.pkgs; [
-    pandoc
-  ];
+  packages = p: [ (import ./. { inherit compiler pkgs; }) ];
+  buildInputs = with pkgs; [ cabal-install pandoc ];
 }