[nix] shell.nix is now a function

np · Jan 15, 2015 · 37af047 · 37af047
1 parent fefb077
commit 37af047
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/shell.nix b/shell.nix
@@ -1,11 +1,13 @@
-let pkgs = (import <nixpkgs> {});
-    haskellPackages = pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
-    extension = self : super :
-    let callPackage = self.callPackage;
-    in {
-       RFC1751 = callPackage ./nix/RFC1751.nix {};
-       thisPackage = haskellPackages.callPackage (import ./default.nix) {};
-    };});
+{ pkgs ? import <nixpkgs> {} }:
+let haskellPackages =
+      pkgs.recurseIntoAttrs
+        (pkgs.haskellPackages.override {
+           extension = self: super:
+                       {
+                         RFC1751 = self.callPackage ./nix/RFC1751.nix {};
+                         thisPackage = haskellPackages.callPackage (import ./default.nix) {};
+                       };
+         });
 in pkgs.lib.overrideDerivation haskellPackages.thisPackage (old: {
    buildInputs = old.buildInputs ++ [
      haskellPackages.cabalInstall