From 543d5baeac2d772a6cff3ea4b8cf14d740f48119 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 6 Nov 2015 00:10:58 +0000 Subject: Support for newer ghc versions & nix-shell --- blog.cabal | 2 +- default.nix | 5 ++++- shell.nix | 11 +++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 shell.nix diff --git a/blog.cabal b/blog.cabal index c014a21..a493c15 100644 --- a/blog.cabal +++ b/blog.cabal @@ -20,7 +20,7 @@ executable site default-language: Haskell2010 hs-source-dirs: src main-is: Site.hs - build-depends: base >=4.7 && <4.8 + build-depends: base >=4.7 && <4.9 , hakyll >=4.6 && <5 , containers >=0.5 && <0.6 , pandoc >=1.13 && <2 diff --git a/default.nix b/default.nix index d3604c3..b5d5fed 100644 --- a/default.nix +++ b/default.nix @@ -7,12 +7,15 @@ let }; dontCheck = drv: overrideCabal drv (drv: { doCheck = false; }); in rec { - beuteltier = pkgs.stdenv.lib.overrideDerivation ( + dirty-haskell = pkgs.stdenv.lib.overrideDerivation ( (pkgs.haskellngPackages.callPackage ./blog.nix {}).override (attrs: attrs // { hakyll = dontCheck pkgs.haskellngPackages.hakyll; }) ) (attrs : { src = ./.; + shellHook = '' + export PROMPT_INFO=${attrs.name} + ''; } ); } diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..c1baba7 --- /dev/null +++ b/shell.nix @@ -0,0 +1,11 @@ +{ pkgs ? (import {}) +}: + +pkgs.stdenv.mkDerivation rec { + name = "dirty-haskell"; + buildInputs = [ (import ./default.nix).dirty-haskell + ]; + shellHook = '' + export PROMPT_INFO=${name} + ''; +} -- cgit v1.2.3