Fixes for callStackToNix

Author: eamsden

call-stack-to-nix.nix

@@ -3,14 +3,14 @@
  * imports the resulting pkgs.nix. The application of this function
  * to a source path can thus be used directly as the input to mkStackPackageSet
  */ 
-{ nix-tools pkgs }: { src, stackYaml ? null }:
+{ nix-tools, pkgs }: { src, stackYaml ? null }:
 let
-  pkgsNix = stdenv.mkDerivation {
-    name = "${pkgs-nix";
+  pkgsNix = pkgs.stdenv.mkDerivation {
+    name = "pkgs-nix";
     inherit src;
     nativeBuildInputs = [ nix-tools pkgs.nix-prefetch-git pkgs.rsync ];
     installPhase = ''
-      export LANG=C.utf8 # Needed or unicode in cabal files will kill stack-to-nix
+      export LANG=C.utf8 # Needed or stack-to-nix will die on unicode inputs
       mkdir -p $out
       stack-to-nix --stack-yaml=$src/${if stackYaml == null then "stack.yaml" else stackYaml} -o $out
       mv $out/pkgs.nix $out/default.nix

default.nix

@@ -52,7 +52,7 @@ let
     override = "stackage";
   });
 
-  packages = pkgs: self: ({
+  packages = pkgs: self: (rec {
     inherit pkgs; # Make pkgs available via callPackage
 
     # Packages built to run on the build platform, not the host platform