From 3e886a657890184823722fbcbf126bfa4a0f0404 Mon Sep 17 00:00:00 2001
From: Julien Tanguy <julien.tanguy@jhome.fr>
Date: Sat, 5 Sep 2015 01:53:08 +0200
Subject: Import generic, updated shell.nix

---
 shell.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/shell.nix b/shell.nix
index 3846dd5..9f7e0c1 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,11 @@
-{ pkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }:
+{ pkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }:
 let hspkgs = pkgs.haskell.packages.${compiler}.override {
-     overrides = self: super: {
-       hmacaroons = self.callPackage ./. {};
-      };
-   };
+  overrides = self: super: {
+    this = self.callPackage ./. {};
+  };
+};
+  hsWithTools = pkgs.lib.overrideDerivation hspkgs.this (attrs: with pkgs; {
+      buildInputs = [ /* Other deps */ ] ++ attrs.buildInputs;
+      });
 in
-  hspkgs.hmacaroons.env
+  hsWithTools.env
-- 
cgit v1.2.3