Tidy up

Author: hamishmack

ci-lib.nix

@@ -1,6 +1,6 @@
 {
   # Generic nixpkgs, use *only* for lib functions that are stable across versions
-  pkgs, # ? (import ./. {}).pkgs,
+  pkgs,
   lib ? pkgs.lib
 }: rec {
   inherit (import ./dimension.nix) dimension;

ci.nix

@@ -6,7 +6,7 @@
 , checkMaterialization ? false
 , compat
 , system
-, evalSystem ? "x86_64-linux"
+, evalSystem ? builtins.currentSystem or "x86_64-linux"
 , pkgs ? (compat { inherit system; }).pkgs }:
  let
   inherit (import ./ci-lib.nix { inherit pkgs; }) dimension platformFilterGeneric filterAttrsOnlyRecursive;

flake.nix

@@ -125,14 +125,14 @@
 
       # FIXME: Currently `nix flake check` requires `--impure` because coverage-golden
       # (and maybe other tests) import projects that use builtins.currentSystem
-#      checks = builtins.listToAttrs (map (pkg: {
-#        name = pkg.name;
-#        value = pkg;
-#      }) (nixpkgs.lib.collect nixpkgs.lib.isDerivation (import ./test rec {
-#        haskellNix = self.internal.compat { inherit system; };
-#        compiler-nix-name = compiler;
-#        pkgs = haskellNix.pkgs;
-#      })));
+      checks = builtins.listToAttrs (map (pkg: {
+        name = pkg.name;
+        value = pkg;
+      }) (nixpkgs.lib.collect nixpkgs.lib.isDerivation (import ./test rec {
+        haskellNix = self.internal.compat { inherit system; };
+        compiler-nix-name = compiler;
+        pkgs = haskellNix.pkgs;
+      })));
       # Exposed so that buildkite can check that `allow-import-from-derivation=false` works for core of haskell.nix
       roots = legacyPackagesUnstable.haskell-nix.roots compiler;
 

release.nix

@@ -26,4 +26,4 @@
     constituents = lib.collect lib.isDerivation jobs;
   };
 in
-  jobs // { inherit required; }
+  jobs // { inherit required; }