From ef2927ee328eb58ef5201ab57d42d96861811a4c Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 10 Jun 2024 13:24:11 +0800 Subject: [PATCH] flake: add branches for NixVim flake inputs --- flake.lock | 253 ++++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 12 ++- 2 files changed, 251 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 045cee26..5f209d6b 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,29 @@ "inputs": { "flake-utils": "flake-utils_5", "nixpkgs": [ - "nixvim", + "nixvim-stable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "owner": "numtide", + "repo": "devshell", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "nixvim-unstable", "nixpkgs" ] }, @@ -215,6 +237,36 @@ "type": "github" } }, + "flake-compat_7": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -278,7 +330,28 @@ "flake-parts_4": { "inputs": { "nixpkgs-lib": [ - "nixvim", + "nixvim-stable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": [ + "nixvim-unstable", "nixpkgs" ] }, @@ -386,6 +459,24 @@ "type": "github" } }, + "flake-utils_6": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -418,11 +509,38 @@ "flake-compat": "flake-compat_6", "gitignore": "gitignore_2", "nixpkgs": [ - "nixvim", + "nixvim-stable", "nixpkgs" ], "nixpkgs-stable": [ - "nixvim", + "nixvim-stable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_3": { + "inputs": { + "flake-compat": "flake-compat_8", + "gitignore": "gitignore_3", + "nixpkgs": [ + "nixvim-unstable", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim-unstable", "nixpkgs" ] }, @@ -465,7 +583,29 @@ "gitignore_2": { "inputs": { "nixpkgs": [ - "nixvim", + "nixvim-stable", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { + "inputs": { + "nixpkgs": [ + "nixvim-unstable", "git-hooks", "nixpkgs" ] @@ -614,7 +754,28 @@ "nix-darwin": { "inputs": { "nixpkgs": [ - "nixvim", + "nixvim-stable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-darwin_2": { + "inputs": { + "nixpkgs": [ + "nixvim-unstable", "nixpkgs" ] }, @@ -818,21 +979,51 @@ "type": "github" } }, - "nixvim": { + "nixvim-stable": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_4", "git-hooks": "git-hooks_2", "home-manager": [ - "home-manager" + "home-manager-stable" ], "nix-darwin": "nix-darwin", "nixpkgs": [ - "nixpkgs" + "nixos-stable" ], "treefmt-nix": "treefmt-nix" }, + "locked": { + "lastModified": 1717920503, + "narHash": "sha256-fBAliCr/O6mFOd0w8fmv28+63sEbHUxvs18IiGPjio8=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "3568de82e7e755883c80ae69fef590aaa44b65b3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "nixos-24.05", + "repo": "nixvim", + "type": "github" + } + }, + "nixvim-unstable": { + "inputs": { + "devshell": "devshell_2", + "flake-compat": "flake-compat_7", + "flake-parts": "flake-parts_5", + "git-hooks": "git-hooks_3", + "home-manager": [ + "home-manager-unstable" + ], + "nix-darwin": "nix-darwin_2", + "nixpkgs": [ + "nixos-unstable" + ], + "treefmt-nix": "treefmt-nix_2" + }, "locked": { "lastModified": 1717922156, "narHash": "sha256-C/TgTnKY4iWXnBmKocV9KeV+OtZGCh+1Pcw26Elx7JM=", @@ -887,7 +1078,11 @@ "nixos-unstable" ], "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim", + "nixvim": [ + "nixvim-unstable" + ], + "nixvim-stable": "nixvim-stable", + "nixvim-unstable": "nixvim-unstable", "nur": "nur", "sops-nix": "sops-nix" } @@ -1028,10 +1223,46 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ - "nixvim", + "nixvim-stable", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nixvim-unstable", "nixpkgs" ] }, diff --git a/flake.nix b/flake.nix index 188acf80..c6ce424f 100644 --- a/flake.nix +++ b/flake.nix @@ -41,9 +41,15 @@ home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; # Make a Neovim distro. - nixvim.url = "github:nix-community/nixvim"; - nixvim.inputs.nixpkgs.follows = "nixpkgs"; - nixvim.inputs.home-manager.follows = "home-manager"; + nixvim.follows = "nixvim-unstable"; + + nixvim-stable.url = "github:nix-community/nixvim/nixos-24.05"; + nixvim-stable.inputs.nixpkgs.follows = "nixos-stable"; + nixvim-stable.inputs.home-manager.follows = "home-manager-stable"; + + nixvim-unstable.url = "github:nix-community/nixvim"; + nixvim-unstable.inputs.nixpkgs.follows = "nixos-unstable"; + nixvim-unstable.inputs.home-manager.follows = "home-manager-unstable"; # This is what AUR strives to be. nur.url = "github:nix-community/NUR";