Use the new flake-compat api

Signed-off-by: Brian McGillion <[email protected]>
tiiuae · Jan 26, 2025 · 9fcf786 · 9fcf786
1 parent 0d6b6b1
commit 9fcf786
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 48 deletions.
diff --git a/default.nix b/default.nix
@@ -5,27 +5,15 @@
 # This file originates from:
 # https://github.com/nix-community/flake-compat
 # This file provides backward compatibility to nix < 2.4 clients
-{
-  system ? builtins.currentSystem,
-}:
-let
-  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-
-  inherit (lock.nodes.flake-compat.locked)
-    owner
-    repo
-    rev
-    narHash
-    ;
-
-  flake-compat = fetchTarball {
-    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
-    sha256 = narHash;
-  };
-
-  flake = import flake-compat {
-    inherit system;
-    src = ./.;
-  };
-in
-flake.defaultNix
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    nodeName = lock.nodes.root.inputs.flake-compat;
+  in
+  fetchTarball {
+    url =
+      lock.nodes.${nodeName}.locked.url
+        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
+    sha256 = lock.nodes.${nodeName}.locked.narHash;
+  }
+) { src = ./.; }).defaultNix
diff --git a/shell.nix b/shell.nix
@@ -5,27 +5,15 @@
 # This file originates from:
 # https://github.com/nix-community/flake-compat
 # This file provides backward compatibility to nix < 2.4 clients
-{
-  system ? builtins.currentSystem,
-}:
-let
-  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-
-  inherit (lock.nodes.flake-compat.locked)
-    owner
-    repo
-    rev
-    narHash
-    ;
-
-  flake-compat = fetchTarball {
-    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
-    sha256 = narHash;
-  };
-
-  flake = import flake-compat {
-    inherit system;
-    src = ./.;
-  };
-in
-flake.shellNix
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    nodeName = lock.nodes.root.inputs.flake-compat;
+  in
+  fetchTarball {
+    url =
+      lock.nodes.${nodeName}.locked.url
+        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
+    sha256 = lock.nodes.${nodeName}.locked.narHash;
+  }
+) { src = ./.; }).shellNix