Merge branch 'hkm/ci-cross-compile' into hkm/ghcjs-9.6.1

# Conflicts: # overlays/bootstrap.nix
input-output-hk · Mar 17, 2023 · 1626b97 · 1626b97
2 parents b0cb03f + 0d18b6f
commit 1626b97
Show file tree

Hide file tree

Showing 6 changed files with 330 additions and 6 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,7 @@
     nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; };
     nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
     flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
-    flake-utils = { url = "github:numtide/flake-utils"; };
+    flake-utils = { url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; };
     tullia = {
       url = "github:input-output-hk/tullia";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/materialized/iserv-proxy/cross/ghc961/.plan.nix/iserv-proxy.nix b/materialized/iserv-proxy/cross/ghc961/.plan.nix/iserv-proxy.nix
diff --git a/materialized/iserv-proxy/cross/ghc961/cabal-files/hsc2hs.nix b/materialized/iserv-proxy/cross/ghc961/cabal-files/hsc2hs.nix