From 309c11400bb7e80b8868004a8d28ee07f3420d66 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 11 Jun 2025 12:04:24 +0300 Subject: [PATCH] nix: simplify flake-compat exp --- default.nix | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/default.nix b/default.nix index 0472edb..cb8dba8 100644 --- a/default.nix +++ b/default.nix @@ -1,21 +1,11 @@ -( - 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 = ./.;} -) +(import ( + let + lock = builtins.fromJSON (builtins.readFile ../flake.lock); + flakeCompatNode = lock.nodes.${lock.nodes.root.inputs.flake-compat}.locked; + in + fetchTarball { + url = "https://github.com/${flakeCompatNode.owner}/${flakeCompatNode.repo}/archive/${flakeCompatNode.rev}.tar.gz"; + sha256 = flakeCompatNode.narHash; + } +) {src = ./.;}) .defaultNix