From 230688a0b842cf57b316a7ba62910ca387afbce7 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 3 Aug 2015 12:49:29 +0200 Subject: Start of complete rewrite to switch to hakyll --- default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index f808b8b..d3604c3 100644 --- a/default.nix +++ b/default.nix @@ -1,12 +1,18 @@ let pkgs = import {}; - stdenv = pkgs.stdenv; - hs = pkgs.haskellPackages; + overrideCabal = drv: f: (drv.override (args: args // { + mkDerivation = drv: args.mkDerivation (drv // f drv); + })) // { + overrideScope = scope: overrideCabal (drv.overrideScope scope) f; + }; + dontCheck = drv: overrideCabal drv (drv: { doCheck = false; }); in rec { - blogEnv = stdenv.mkDerivation rec { - name = "blog-env"; - version = "1"; - src = ./.; - buildInputs = [ hs.pandoc hs.pandocTypes hs.cryptohash hs.strict hs.feed ]; - }; + beuteltier = pkgs.stdenv.lib.overrideDerivation ( + (pkgs.haskellngPackages.callPackage ./blog.nix {}).override (attrs: attrs // { + hakyll = dontCheck pkgs.haskellngPackages.hakyll; + }) + ) (attrs : { + src = ./.; + } + ); } -- cgit v1.2.3