always clean the source, no matter what (input-output-hk#1403)

* always clean the source, no matter what

* update hydra

flake.nix

@@ -8,6 +8,7 @@
     nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };
     nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
     flake-utils = { url = "github:numtide/flake-utils"; };
+    hydra.url = "hydra";
     hackage = {
       url = "github:input-output-hk/hackage.nix";
       flake = false;

lib/call-cabal-project-to-nix.nix

@@ -103,15 +103,13 @@ let
   ghc = ghc';
   subDir' = src.origSubDir or "";
   subDir = pkgs.lib.strings.removePrefix "/" subDir';
-  maybeCleanedSource =
-    if haskellLib.canCleanSource src
-      then (haskellLib.cleanSourceWith {
-        name = if name != null then "${name}-root-cabal-files" else "source-root-cabal-files";
-        src = src.origSrc or src;
-        filter = path: type: (!(src ? filter) || src.filter path type) && (
-          type == "directory" ||
-          pkgs.lib.any (i: (pkgs.lib.hasSuffix i path)) [ ".cabal" "package.yaml" ]); })
-      else src.origSrc or src;
+
+  cleanedSource = haskellLib.cleanSourceWith {
+    name = if name != null then "${name}-root-cabal-files" else "source-root-cabal-files";
+    src = src.origSrc or src;
+    filter = path: type: (!(src ? filter) || src.filter path type) && (
+      type == "directory" ||
+      pkgs.lib.any (i: (pkgs.lib.hasSuffix i path)) [ ".cabal" "package.yaml" ]); };
 
   # Using origSrcSubDir bypasses any cleanSourceWith so that it will work when
   # access to the store is restricted.  If origSrc was already in the store
@@ -473,17 +471,17 @@ let
   } ''
     tmp=$(mktemp -d)
     cd $tmp
-    # if maybeCleanedSource is empty, this means it's a new
+    # if cleanedSource is empty, this means it's a new
     # project where the files haven't been added to the git
     # repo yet. We fail early and provide a useful error
     # message to prevent headaches (#290).
-    if [ -z "$(ls -A ${maybeCleanedSource})" ]; then
+    if [ -z "$(ls -A ${cleanedSource})" ]; then
       echo "cleaned source is empty. Did you forget to 'git add -A'?"
       ${pkgs.lib.optionalString (__length fixedProject.sourceRepos == 0) ''
         exit 1
       ''}
     else
-      cp -r ${maybeCleanedSource}/* .
+      cp -r ${cleanedSource}/* .
     fi
     chmod +w -R .
     # Decide what to do for each `package.yaml` file.

overlays/default.nix

@@ -10,6 +10,7 @@ let
     bootstrap = import ./bootstrap.nix;
     ghc = import ./ghc.nix;
     ghc-packages = import ./ghc-packages.nix;
+    hydra = import ./hydra.nix args;
     darwin = import ./darwin.nix;
     windows = import ./windows.nix;
     armv6l-linux = import ./armv6l-linux.nix;
@@ -56,6 +57,7 @@ let
     gobject-introspection
     hix
     eval-packages
+    hydra
     # Restore nixpkgs haskell and haskellPackages
     (_: prev: { inherit (prev.haskell-nix-prev) haskell haskellPackages; })
   ];

overlays/hydra.nix

@@ -0,0 +1,5 @@
+{ sources, ...}:
+
+final: prev: {
+  hydra-unstable = sources.hydra.defaultPackage.${prev.system};
+}

scripts/check-hydra.nix

@@ -8,14 +8,15 @@ writeScript "check-hydra.sh" ''
   set -euo pipefail
 
   export PATH="${makeBinPath [ coreutils time gnutar gzip hydra-unstable jq gitMinimal ]}"
+  export NIX_PATH=
 
   echo '~~~ Evaluating release.nix with --arg ifdLevel '$1
   command time --format '%e' -o eval-time.txt \
       hydra-eval-jobs \
       --option allowed-uris "https://github.com/NixOS https://github.com/input-output-hk" \
       --arg supportedSystems '[ builtins.currentSystem ]' \
       --arg ifdLevel $1 \
-      -I . release.nix > eval.json
+      -I $(realpath .) release.nix > eval.json
   EVAL_EXIT_CODE="$?"
   if [ "$EVAL_EXIT_CODE" != 0 ]
   then