From 7339f64dd84c070b7706cf74afe2c03833b1862d Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 28 Feb 2023 10:54:48 +0300 Subject: [PATCH] dev: attempt to use the zig overlay instead of nixpkgs/zig --- flake.lock | 176 +++++++++++++++++++++++++++++++++++++-- flake.nix | 7 ++ flake/legacyPackages.nix | 3 + 3 files changed, 178 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 390eb4f..e95038e 100644 --- a/flake.lock +++ b/flake.lock @@ -321,6 +321,38 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -354,6 +386,36 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gesture-nvim": { "flake": false, "locked": { @@ -567,6 +629,50 @@ "type": "github" } }, + "neovim-flake": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "dir": "contrib", + "lastModified": 1677463842, + "narHash": "sha256-MgUEDPza573qKV59nRqrykLblPKBZu+DAIUqg9Pl5wU=", + "owner": "neovim", + "repo": "neovim", + "rev": "2c9fbe34b20266ef5ab54f6ed14fb38eef60430d", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, + "neovim-nightly-overlay": { + "inputs": { + "flake-compat": "flake-compat", + "neovim-flake": "neovim-flake", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1677485761, + "narHash": "sha256-C04OWgNrCxPGUiT7Px/vZd42vfwRY6/EjHwHNUSHv7g=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "aad4d8be05012055861b097b8019311fe62635bf", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, "nil": { "inputs": { "flake-utils": [ @@ -593,11 +699,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677468890, - "narHash": "sha256-V4MPvt4PKaHSInRLWpaF8ICdC91SH+5bdd0FGxalJIg=", + "lastModified": 1677383253, + "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f19c04354dec3903f614eae09327a04d297835d", + "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", "type": "github" }, "original": { @@ -626,6 +732,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1677468890, + "narHash": "sha256-V4MPvt4PKaHSInRLWpaF8ICdC91SH+5bdd0FGxalJIg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f19c04354dec3903f614eae09327a04d297835d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -641,7 +763,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1655400192, "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=", @@ -657,6 +779,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1661151577, + "narHash": "sha256-++S0TuJtuz9IpqP8rKktWyHZKpgdyrzDFUXVY07MTRI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "54060e816971276da05970a983487a25810c38a7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -1061,7 +1199,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -1113,8 +1251,9 @@ "lualine": "lualine", "mind-nvim": "mind-nvim", "minimap-vim": "minimap-vim", + "neovim-nightly-overlay": "neovim-nightly-overlay", "nil": "nil", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nmd": "nmd", "noice-nvim": "noice-nvim", "nui-nvim": "nui-nvim", @@ -1155,7 +1294,8 @@ "vim-markdown": "vim-markdown", "vim-startify": "vim-startify", "vim-vsnip": "vim-vsnip", - "which-key": "which-key" + "which-key": "which-key", + "zig": "zig" } }, "rust-overlay": { @@ -1300,7 +1440,7 @@ "tidalcycles": { "inputs": { "dirt-samples-src": "dirt-samples-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "superdirt-src": "superdirt-src", "tidal-src": "tidal-src", "utils": "utils_2", @@ -1528,6 +1668,26 @@ "repo": "which-key.nvim", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1677457546, + "narHash": "sha256-R2k5sOzf6dEg/PbMfZNYFjmJQY1Hbd/4sc8H36I3EAM=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "2b07e4e3e3eb07134ac61049abdc1da1ff6c5516", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 778509b..aafbfc1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ outputs = { nixpkgs, flake-parts, + zig, ... } @ inputs: flake-parts.lib.mkFlake {inherit inputs;} { @@ -47,12 +48,18 @@ flake-parts.url = "github:hercules-ci/flake-parts"; flake-utils.url = "github:numtide/flake-utils"; + # TODO: neovim nightly + neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + # For generating documentation website nmd = { url = "gitlab:rycee/nmd"; flake = false; }; + # TODO: get zig from the zig overlay instead of nixpkgs + zig.url = "github:mitchellh/zig-overlay"; + # LSP plugins nvim-lspconfig = { # url = "github:neovim/nvim-lspconfig?ref=v0.1.3"; diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix index d6fb73c..bd284be 100644 --- a/flake/legacyPackages.nix +++ b/flake/legacyPackages.nix @@ -9,9 +9,12 @@ overlays = [ inputs.tidalcycles.overlays.default inputs.self.overlays.default + inputs.neovim-nightly-overlay.overlay + inputs.zig.overlays.default (_: _: { rnix-lsp = inputs'.rnix-lsp.defaultPackage; nil = inputs'.nil.packages.default; + zig = inputs'.zig.packages.default; }) ]; };