mirror of
https://github.com/ilyakooo0/haskell.nix.git
synced 2024-09-11 06:55:40 +03:00
Add cleanSourceHaskell and use it on nix-tools (#144)
Currently if you override nix-tools using `-I nix-tools` to point to a local directory that has build output directories like `dist-newstyle` those directories are hashed and copied to the nix store if they have changes. This change adds the `cleanHaskellSource` function from `iohk-nix` and runs it on nix-tools.
This commit is contained in:
parent
1f4730f728
commit
3d1c8afcde
@ -38,6 +38,9 @@ let
|
||||
# overridden with NIX_PATH.
|
||||
fetchExternal = import ./lib/fetch-external.nix;
|
||||
|
||||
# Function for cleaning haskell source directories pulled from iohk-nix
|
||||
cleanSourceHaskell = pkgs.callPackage ./lib/clean-source-haskell.nix {};
|
||||
|
||||
# All packages from Hackage as Nix expressions
|
||||
hackage = import (fetchExternal {
|
||||
name = "hackage-exprs-source";
|
||||
@ -108,7 +111,7 @@ let
|
||||
# Programs for generating Nix expressions from Cabal and Stack
|
||||
# files. We need to make sure we build this from the buildPackages,
|
||||
# we never want to actually cross compile nix-tools on it's own.
|
||||
nix-tools = pkgs.buildPackages.callPackage ./nix-tools { inherit fetchExternal; inherit (self) mkCabalProjectPkgSet; };
|
||||
nix-tools = pkgs.buildPackages.callPackage ./nix-tools { inherit fetchExternal cleanSourceHaskell; inherit (self) mkCabalProjectPkgSet; };
|
||||
|
||||
# Function to call stackToNix
|
||||
callStackToNix = self.callPackage ./call-stack-to-nix.nix {};
|
||||
@ -127,6 +130,9 @@ let
|
||||
# Make this handy overridable fetch function available.
|
||||
inherit fetchExternal;
|
||||
|
||||
# Function for cleaning haskell source diretories.
|
||||
inherit cleanSourceHaskell;
|
||||
|
||||
# Produce a fixed output derivation from a moving target (hackage index tarball)
|
||||
hackageTarball = { index-state, sha256 }:
|
||||
pkgs.runCommand "01-index.tar.gz-at-${builtins.replaceStrings [":"] [""] index-state}" {
|
||||
|
25
lib/clean-source-haskell.nix
Normal file
25
lib/clean-source-haskell.nix
Normal file
@ -0,0 +1,25 @@
|
||||
# This function cleans common build products and files not needed to do a
|
||||
# haskell build from a source directory.
|
||||
# This can avoid unecessary builds when these files change.
|
||||
# It has been copied from iohk-nix so that it can be used internally in
|
||||
# haskell.nix and made available to projects that do not use iohk-nix.
|
||||
# The original version is here:
|
||||
# https://github.com/input-output-hk/iohk-nix/blob/c01bbd4e0c55a4101e2078d24046e0b2a731f871/clean-source-haskell.nix
|
||||
{ pkgs }: src:
|
||||
let lib = pkgs.lib;
|
||||
in if (builtins.typeOf src) == "path"
|
||||
then lib.cleanSourceWith {
|
||||
filter = with pkgs.stdenv;
|
||||
name: type: let baseName = baseNameOf (toString name); in ! (
|
||||
# Filter out cabal build products.
|
||||
baseName == "dist" || baseName == "dist-newstyle" ||
|
||||
baseName == "cabal.project.local" ||
|
||||
lib.hasPrefix ".ghc.environment" baseName ||
|
||||
# Filter out stack build products.
|
||||
lib.hasPrefix ".stack-work" baseName ||
|
||||
# Filter out files which are commonly edited but don't
|
||||
# affect the cabal build.
|
||||
lib.hasSuffix ".nix" baseName
|
||||
);
|
||||
src = lib.cleanSource src;
|
||||
} else src
|
@ -1,11 +1,11 @@
|
||||
{ symlinkJoin, fetchExternal, mkCabalProjectPkgSet }:
|
||||
{ symlinkJoin, fetchExternal, cleanSourceHaskell, mkCabalProjectPkgSet }:
|
||||
|
||||
let
|
||||
src = fetchExternal {
|
||||
src = cleanSourceHaskell (fetchExternal {
|
||||
name = "nix-tools-src";
|
||||
specJSON = ./nix-tools-src.json;
|
||||
override = "nix-tools";
|
||||
};
|
||||
});
|
||||
|
||||
pkgSet = mkCabalProjectPkgSet {
|
||||
plan-pkgs = import ./pkgs.nix;
|
||||
|
Loading…
Reference in New Issue
Block a user