Make it easier to override package src, add cleanSource to build

Author: rvl

lib/Cabal2Nix.hs

@@ -142,10 +142,10 @@ class ToNixBinding a where
   toNixBinding :: a -> Binding NExpr
 
 instance ToNixExpr Src where
-  toNix (Path p) = mkRecSet [ "src" $= mkRelPath p ]
+  toNix (Path p) = mkRecSet [ "src" $= applyMkDefault (mkRelPath p) ]
   toNix (Git url rev mbSha256 mbPath)
     = mkNonRecSet $
-      [ "src" $= (mkSym pkgs @. "fetchgit" @@ mkNonRecSet
+      [ "src" $= applyMkDefault (mkSym pkgs @. "fetchgit" @@ mkNonRecSet
         [ "url"    $= mkStr (fromString url)
         , "rev"    $= mkStr (fromString rev)
         , "sha256" $= case mbSha256 of
@@ -157,6 +157,9 @@ instance ToNixExpr Src where
         $= mkStr (fromString $ "sourceRoot+=/" <> root <> "; echo source root reset to $sourceRoot")
       | Just root <- [mbPath] ]
 
+applyMkDefault :: NExpr -> NExpr
+applyMkDefault expr = mkSym pkgs @. "lib" @. "mkDefault" @@ expr
+
 instance ToNixExpr PackageIdentifier where
   toNix ident = mkNonRecSet [ "name"    $= mkStr (fromString (show (disp (pkgName ident))))
                             , "version" $= mkStr (fromString (show (disp (pkgVersion ident))))]

nix-tools.nix

@@ -25,7 +25,7 @@
     };
     components = {
       "library" = {
-        depends  = [
+        depends = [
           (hsPkgs.base)
           (hsPkgs.hnix)
           (hsPkgs.aeson)
@@ -45,7 +45,7 @@
       };
       exes = {
         "cabal-to-nix" = {
-          depends  = [
+          depends = [
             (hsPkgs.base)
             (hsPkgs.transformers)
             (hsPkgs.bytestring)
@@ -59,7 +59,7 @@
           ];
         };
         "hashes-to-nix" = {
-          depends  = [
+          depends = [
             (hsPkgs.base)
             (hsPkgs.hnix)
             (hsPkgs.nix-tools)
@@ -73,7 +73,7 @@
           ];
         };
         "plan-to-nix" = {
-          depends  = [
+          depends = [
             (hsPkgs.base)
             (hsPkgs.nix-tools)
             (hsPkgs.hnix)
@@ -86,7 +86,7 @@
           ];
         };
         "hackage-to-nix" = {
-          depends  = [
+          depends = [
             (hsPkgs.base)
             (hsPkgs.nix-tools)
             (hsPkgs.hackage-db)
@@ -103,7 +103,7 @@
           ];
         };
         "lts-to-nix" = {
-          depends  = [
+          depends = [
             (hsPkgs.base)
             (hsPkgs.nix-tools)
             (hsPkgs.hnix)
@@ -119,7 +119,7 @@
           ];
         };
         "stack-to-nix" = {
-          depends  = [
+          depends = [
             (hsPkgs.base)
             (hsPkgs.nix-tools)
             (hsPkgs.transformers)
@@ -138,8 +138,13 @@
             (hsPkgs.hpack)
             (hsPkgs.bytestring)
             (hsPkgs.optparse-applicative)
+            (hsPkgs.http-client-tls)
+            (hsPkgs.http-client)
+            (hsPkgs.http-types)
           ];
         };
       };
     };
-  } // rec { src = ./.; }
+  } // rec {
+    src = pkgs.lib.mkDefault ./.;
+  }

pkgs.nix

@@ -40,6 +40,9 @@ let
     ];
     modules = [
       # specific package overrides would go here
+      ({ lib, ... }: {
+        packages.nix-tools.src = lib.cleanSource ./.;
+      })
     ];
   };