default.nix: use the correct flake-compat input

This commit is contained in:
Gabriel Arazas 2024-01-14 12:53:55 +08:00
parent 68298a7ccc
commit a6d6e224bb
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
3 changed files with 14 additions and 10 deletions

View File

@ -1,9 +1,13 @@
{ compat-flake ? "flake-compat-fds" }:
(import (import
( (
let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in
fetchTarball { fetchTarball {
url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; 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.flake-compat.locked.narHash; sha256 = lock.nodes.${compat-flake}.locked.narHash;
} }
) )
{ src = ./.; } { src = ./.; }

12
flake.lock generated
View File

@ -138,7 +138,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": { "flake-compat-fds": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@ -152,7 +152,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
} }
}, },
"flake-compat_3": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -168,7 +168,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_4": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -442,7 +442,7 @@
}, },
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
@ -589,7 +589,7 @@
}, },
"nixos-wsl": { "nixos-wsl": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -725,7 +725,7 @@
"devshell": "devshell", "devshell": "devshell",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"flake-compat": "flake-compat_2", "flake-compat-fds": "flake-compat-fds",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"helix-editor": "helix-editor", "helix-editor": "helix-editor",
"home-manager": [ "home-manager": [

View File

@ -77,7 +77,7 @@
nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
# Make a default.nix compatible stuff. # 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, ... }: outputs = inputs@{ self, nixpkgs, ... }: