diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-06 00:10:58 +0000 | 
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-06 00:10:58 +0000 | 
| commit | 543d5baeac2d772a6cff3ea4b8cf14d740f48119 (patch) | |
| tree | 111b867fef6bb24ec5eb6fcf40f2dafc2f736205 | |
| parent | 7eed8a496de2f79517c9ab476a2fb7d84d51c679 (diff) | |
| download | dirty-haskell.org-543d5baeac2d772a6cff3ea4b8cf14d740f48119.tar dirty-haskell.org-543d5baeac2d772a6cff3ea4b8cf14d740f48119.tar.gz dirty-haskell.org-543d5baeac2d772a6cff3ea4b8cf14d740f48119.tar.bz2 dirty-haskell.org-543d5baeac2d772a6cff3ea4b8cf14d740f48119.tar.xz dirty-haskell.org-543d5baeac2d772a6cff3ea4b8cf14d740f48119.zip | |
Support for newer ghc versions & nix-shell
| -rw-r--r-- | blog.cabal | 2 | ||||
| -rw-r--r-- | default.nix | 5 | ||||
| -rw-r--r-- | shell.nix | 11 | 
3 files changed, 16 insertions, 2 deletions
| @@ -20,7 +20,7 @@ executable site | |||
| 20 | default-language: Haskell2010 | 20 | default-language: Haskell2010 | 
| 21 | hs-source-dirs: src | 21 | hs-source-dirs: src | 
| 22 | main-is: Site.hs | 22 | main-is: Site.hs | 
| 23 | build-depends: base >=4.7 && <4.8 | 23 | build-depends: base >=4.7 && <4.9 | 
| 24 | , hakyll >=4.6 && <5 | 24 | , hakyll >=4.6 && <5 | 
| 25 | , containers >=0.5 && <0.6 | 25 | , containers >=0.5 && <0.6 | 
| 26 | , pandoc >=1.13 && <2 | 26 | , 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 | |||
| 7 | }; | 7 | }; | 
| 8 | dontCheck = drv: overrideCabal drv (drv: { doCheck = false; }); | 8 | dontCheck = drv: overrideCabal drv (drv: { doCheck = false; }); | 
| 9 | in rec { | 9 | in rec { | 
| 10 | beuteltier = pkgs.stdenv.lib.overrideDerivation ( | 10 | dirty-haskell = pkgs.stdenv.lib.overrideDerivation ( | 
| 11 | (pkgs.haskellngPackages.callPackage ./blog.nix {}).override (attrs: attrs // { | 11 | (pkgs.haskellngPackages.callPackage ./blog.nix {}).override (attrs: attrs // { | 
| 12 | hakyll = dontCheck pkgs.haskellngPackages.hakyll; | 12 | hakyll = dontCheck pkgs.haskellngPackages.hakyll; | 
| 13 | }) | 13 | }) | 
| 14 | ) (attrs : { | 14 | ) (attrs : { | 
| 15 | src = ./.; | 15 | src = ./.; | 
| 16 | shellHook = '' | ||
| 17 | export PROMPT_INFO=${attrs.name} | ||
| 18 | ''; | ||
| 16 | } | 19 | } | 
| 17 | ); | 20 | ); | 
| 18 | } | 21 | } | 
| diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..c1baba7 --- /dev/null +++ b/shell.nix | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | { pkgs ? (import <nixpkgs> {}) | ||
| 2 | }: | ||
| 3 | |||
| 4 | pkgs.stdenv.mkDerivation rec { | ||
| 5 | name = "dirty-haskell"; | ||
| 6 | buildInputs = [ (import ./default.nix).dirty-haskell | ||
| 7 | ]; | ||
| 8 | shellHook = '' | ||
| 9 | export PROMPT_INFO=${name} | ||
| 10 | ''; | ||
| 11 | } | ||
