Import generic, updated shell.nix

diff --git a/shell.nix b/shell.nix
index 3846dd5bf7bc9d4862a420086bc9293865ba58d3..9f7e0c17b4e26b609aa8f0de4bd29b50a666477f 100644 (file)
--- 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