From a6d6e224bbd158426ebe1468b12cd6cf34b025f1 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 14 Jan 2024 12:53:55 +0800 Subject: [PATCH] default.nix: use the correct flake-compat input --- default.nix | 10 +++++++--- flake.lock | 12 ++++++------ flake.nix | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/default.nix b/default.nix index f620865d..bfb48211 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,13 @@ +{ compat-flake ? "flake-compat-fds" }: + (import ( - let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in + let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + in fetchTarball { - url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; + url = lock.nodes.${compat-flake}.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.${compat-flake}.locked.narHash; } ) { src = ./.; } diff --git a/flake.lock b/flake.lock index 264263ae..28e7347f 100644 --- a/flake.lock +++ b/flake.lock @@ -138,7 +138,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat-fds": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -152,7 +152,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -168,7 +168,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -442,7 +442,7 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", @@ -589,7 +589,7 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" @@ -725,7 +725,7 @@ "devshell": "devshell", "disko": "disko", "emacs-overlay": "emacs-overlay", - "flake-compat": "flake-compat_2", + "flake-compat-fds": "flake-compat-fds", "flake-utils": "flake-utils_3", "helix-editor": "helix-editor", "home-manager": [ diff --git a/flake.nix b/flake.nix index a76b5bcf..8c682b4f 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; # Make a default.nix compatible stuff. - flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; + flake-compat-fds.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; }; outputs = inputs@{ self, nixpkgs, ... }: