Workaround flake-compat bug

edolstra/flake-compat#32 (comment)
rustshop · Jun 28, 2022 · 26824e3 · 26824e3
1 parent 0bfd8e3
commit 26824e3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/infra/flake.nix b/infra/flake.nix
@@ -14,9 +14,10 @@
   outputs = { self, nixpkgs, flake-utils, flake-compat}:
     flake-utils.lib.eachDefaultSystem (system:
     let
-      imp = (import ./utils/aws-bootstrap/default.nix);
-      overlay = self: super: {
-        aws-bootstrap = builtins.trace ''${imp}'' imp.default;
+      overlay = self: super: let
+        imp = (import ./utils/aws-bootstrap/default-system.nix) system;
+      in {
+        aws-bootstrap = builtins.trace imp imp.default;
       };
       pkgs = import nixpkgs {
         inherit system;

diff --git a/infra/utils/aws-bootstrap/default-system.nix b/infra/utils/aws-bootstrap/default-system.nix
@@ -0,0 +1,16 @@
+# See https://github.com/edolstra/flake-compat/issues/32#issuecomment-1169370930
+system:
+(import
+  (
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  {
+    src = ./.;
+    system = system;
+  }).defaultNix