[commit: ghc] master: Make shell.nix less broken (#510) (da39729)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/da397291a9052387862c27c87ec29b6fce2c7d77/ghc

>---------------------------------------------------------------

commit da397291a9052387862c27c87ec29b6fce2c7d77
Author: Sebastian Graf <sgraf1337 at gmail.com>
Date:   Fri Feb 23 16:50:23 2018 +0100

    Make shell.nix less broken (#510)
    
    * shell.nix: Use ghc822 (ghc821 is no longer available)
    
    * shell.nix: It's nativeBuildInputs now
    
    * shell.nix: ./validate needs sphinx to be available


>---------------------------------------------------------------

da397291a9052387862c27c87ec29b6fce2c7d77
 shell.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/shell.nix b/shell.nix
index f15f72b..d8767cd 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,7 +5,7 @@
 { nixpkgs ? import <nixpkgs> {} }:
 
 let
-  haskellPackages = nixpkgs.haskell.packages.ghc821;
+  haskellPackages = nixpkgs.haskell.packages.ghc822;
 
   removeBuild = path: type:
     let baseName = baseNameOf (toString path);
@@ -23,7 +23,7 @@ let
   filterSrc = path: builtins.filterSource removeBuild path;
 
 
-  hadrianPackages = nixpkgs.haskell.packages.ghc821.override {
+  hadrianPackages = nixpkgs.haskell.packages.ghc822.override {
     overrides = self: super: let
         localPackage = name: path: self.callCabal2nix name (filterSrc path) {};
       in {
@@ -43,9 +43,10 @@ in
   nixpkgs.lib.overrideDerivation nixpkgs.haskell.packages.ghcHEAD.ghc
     (drv: {
       name = "ghc-dev";
-      buildInputs = drv.buildInputs ++ [
-                    hadrianPackages.hadrian
-                    nixpkgs.arcanist
-                    ];
+      nativeBuildInputs = drv.nativeBuildInputs ++ 
+        [ hadrianPackages.hadrian
+          nixpkgs.arcanist
+          nixpkgs.python3Packages.sphinx
+        ];
     })