From e6e9d0e3b08cb6eff3684b83b8f09e3d8880e3ef Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Thu, 11 Aug 2022 10:53:40 +0200 Subject: [PATCH] Remove zig overlay - builds on macOS now --- README.md | 1 - flake.lock | 63 +++++++-------------------------- flake.nix | 5 --- home/programs/nvim/plugins.nix | 44 +++++++++++------------ home/programs/nvim/plugins.yaml | 2 +- system/flakes/Styx.nix | 2 -- system/flakes/adsb-antenna.nix | 2 -- system/flakes/sail.nix | 2 -- 8 files changed, 36 insertions(+), 85 deletions(-) diff --git a/README.md b/README.md index 9f4d778..42734be 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,4 @@ ## Overlays * [neovim-nightly-overlay](https://github.com/nix-community/neovim-nightly-overlay) -* [zig-overlay](https://github.com/arqv/zig-overlay) * [nifoc-overlay](https://github.com/nifoc/nix-overlay) diff --git a/flake.lock b/flake.lock index dfd6237..0b5824a 100644 --- a/flake.lock +++ b/flake.lock @@ -71,21 +71,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -117,11 +102,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1659977912, - "narHash": "sha256-oEkmHMKRyv8HTJW6f3qFbSiuXdYSE/8eegJgcE5Gs8o=", + "lastModified": 1660203895, + "narHash": "sha256-1CzvKo2RWIjUJxqVFXlvjhOBL0mHU9s4QmCPSTe1S4M=", "owner": "neovim", "repo": "neovim", - "rev": "e6680ea7c3912d38f2ef967e053be741624633ad", + "rev": "94c317647845b92d675548a481f664a6a1808426", "type": "github" }, "original": { @@ -140,11 +125,11 @@ ] }, "locked": { - "lastModified": 1660033016, - "narHash": "sha256-LQVgEu5jPPq5e9b+fH1wKE9Sl8iErfqaGHWZcMkzGOE=", + "lastModified": 1660205755, + "narHash": "sha256-wmD/8nqR0eHsoqBSXRA1sKoT+zDCTo91ELKDo9+k+CE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1af7c5862b462e0ad938302805efc116548884d1", + "rev": "06308949fecc207489eb905f9b3ad692087a2b41", "type": "github" }, "original": { @@ -160,11 +145,11 @@ ] }, "locked": { - "lastModified": 1660033736, - "narHash": "sha256-N03jvlh3R8+grynjG/TXGLPc2xQ9P2kSWGwai5w9pPw=", + "lastModified": 1660206443, + "narHash": "sha256-2VZOEgNBPmHN9yNM5hfp+ff4Gz5SpCtwrDcfwNxdjjw=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "2cfd669f9c7ec1bc812f483e17fe1854e34f86aa", + "rev": "7d25ddc009a5fb4891d10aeaf140945687b90637", "type": "github" }, "original": { @@ -175,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660017629, - "narHash": "sha256-Koz6/k7c6hx4qVz/bboxdR2QsBdkxjRWpNmsOWJtXZE=", + "lastModified": 1660167503, + "narHash": "sha256-RAjzibSoilQ7+okrwvez59Ho6Nvf0FJm/F6ZJGjTksg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f15d6c3a74d2778c6e1af67947c95f100dc6fd2", + "rev": "ebcea6302e4b221e79656f7a718f5cb55affde2f", "type": "github" }, "original": { @@ -196,8 +181,7 @@ "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nifoc-overlay": "nifoc-overlay", - "nixpkgs": "nixpkgs", - "zig-overlay": "zig-overlay" + "nixpkgs": "nixpkgs" } }, "utils": { @@ -214,27 +198,6 @@ "repo": "flake-utils", "type": "github" } - }, - "zig-overlay": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1659919434, - "narHash": "sha256-U6QsM5FbFpEkqPfXwe/QvNdCWwBIXW9A3fhXo3hFps8=", - "owner": "arqv", - "repo": "zig-overlay", - "rev": "db9604e7fff0a41f06302d61dd4f320c4e23b81e", - "type": "github" - }, - "original": { - "owner": "arqv", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f28927f..d71ee3c 100644 --- a/flake.nix +++ b/flake.nix @@ -22,11 +22,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - zig-overlay = { - url = "github:arqv/zig-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nifoc-overlay = { url = "github:nifoc/nix-overlay"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 0817448..7e55812 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -113,12 +113,12 @@ }; nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-08-09"; + version = "2022-08-10"; src = pkgs.fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "0c19f1eda263a1d44b6741e727fef223886c80a8"; - sha256 = "0n01yfjldf2qcwyzmjpqnrccsy7xax191c26y1zsyahlfxk70ay9"; + rev = "1e904f6d1b41adb9d3b87df2108dc4a315a72379"; + sha256 = "1x4mfq63z7fxg7cyv2dmhzy7kxq9xgz16cvfj69gxz0mqxmmg3xz"; fetchSubmodules = false; }; }; @@ -135,12 +135,12 @@ }; telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-08-09"; + version = "2022-08-10"; src = pkgs.fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "8f80e821085bdb4583e78ea685e68dc34209d360"; - sha256 = "1m6cw6xgbmx07pnxn351650v53nmmndjwliwwk1fq6gsyiyixxk3"; + rev = "8746347ac4065f5795e7bd33c7912ab1152cca4b"; + sha256 = "1xxhkfk62mrv1sw26yslqrjvdrd92i2ghnnhz28s6if47lvzlv3n"; fetchSubmodules = false; }; }; @@ -154,7 +154,7 @@ sha256 = "11fmsalkx4hx0vd28q0hvw6jcvnb8qd7f0y69f7rlbd2n0mh9vx4"; fetchSubmodules = true; }; - nativeBuildInputs = with pkgs; [ just zigpkgs."0.9.1" ]; + nativeBuildInputs = with pkgs; [ just zig ]; buildPhase = '' just clean XDG_CACHE_HOME=./xdg_cache just build @@ -263,12 +263,12 @@ }; LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "LuaSnip"; - version = "2022-08-07"; + version = "2022-08-10"; src = pkgs.fetchFromGitHub { owner = "L3MON4D3"; repo = "LuaSnip"; - rev = "c599c560ed26f04f5bdb7e4498b632dc16fb9209"; - sha256 = "0wi3gzy9mqwaaqd16gikfycj1zkk20x79aqglzbrv1bd17863jk9"; + rev = "3d6c52babf918294ea12e6f46a3df008d0ca4299"; + sha256 = "1wqn906djb9w1cwjvqg2wvxvwig1zpyllmldkq0zr56npfgsmc6d"; fetchSubmodules = false; }; }; @@ -351,12 +351,12 @@ }; cmp-buffer = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2022-06-15"; + version = "2022-08-10"; src = pkgs.fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "62fc67a2b0205136bc3e312664624ba2ab4a9323"; - sha256 = "0wcys2z1yw6raxr9x5nm19ac04q8gfri4pw9mfsh18smv4rnl8zs"; + rev = "3022dbc9166796b644a841a02de8dd1cc1d311fa"; + sha256 = "1cwx8ky74633y0bmqmvq1lqzmphadnhzmhzkddl3hpb7rgn18vkl"; fetchSubmodules = false; }; }; @@ -406,12 +406,12 @@ }; nvim-autopairs = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-08-06"; + version = "2022-08-11"; src = pkgs.fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "ca89ab9e7e42aa9279f1cdad15398d6e18ccee86"; - sha256 = "1gyaigj2ch820ikikr7123v2yfm6i08bfaxivayixxw27bj3y2d5"; + rev = "34bd374f75fb58656572f847e2bc3565b0acb34f"; + sha256 = "1wx2gmv46xlxbnhhw0vcxpj79ss51g0g0i6fpip9xwx2g0dp88da"; fetchSubmodules = false; }; }; @@ -439,12 +439,12 @@ }; nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-07-31"; + version = "2022-08-10"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "b8df8b07b4ec2fea8af606004c952b1881402b1e"; - sha256 = "03hrhwsn97229fxd3yxkcgfpcjf0s6agg4kbaxrcw36w181wx53s"; + rev = "30a5e25f92852fa8ee57d49760f08e37f1f614ed"; + sha256 = "0n553x2gp4waf1dzxsc6hp9b4z1wdlx6iv2p1hpfzmvdij5fx21f"; fetchSubmodules = false; }; }; @@ -549,12 +549,12 @@ }; gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-08-01"; + version = "2022-08-10"; src = pkgs.fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "9c3ca027661136a618c82275427746e481c84a4e"; - sha256 = "089nqxs54x5bi55zkdynln32xvq9jfadlp95l85dal6c5nmn7yyi"; + rev = "ce636faddd573c1e6d821250da713e00e99d0f74"; + sha256 = "0gf4wvc6rz6g1n0cj2b708vhcrgriynk7xx29qcbli37rjwaafaj"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index 30cb473..4abd0dc 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -27,7 +27,7 @@ fetchSubmodules: true nativeBuildInputs: - just - - zigpkgs."0.9.1" + - zig buildPhase: |- just clean XDG_CACHE_HOME=./xdg_cache just build diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix index 17e9287..aecac49 100644 --- a/system/flakes/Styx.nix +++ b/system/flakes/Styx.nix @@ -3,14 +3,12 @@ let overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; overlay-neovim = inputs.neovim-nightly-overlay.overlay; - overlay-zig = _: prev: { zigpkgs = inputs.zig-overlay.packages.${prev.system}; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-x86 overlay-neovim - overlay-zig overlay-nifoc ]; diff --git a/system/flakes/adsb-antenna.nix b/system/flakes/adsb-antenna.nix index 18bd3f8..428c79a 100644 --- a/system/flakes/adsb-antenna.nix +++ b/system/flakes/adsb-antenna.nix @@ -3,14 +3,12 @@ let overlay-arion = arion.overlay; overlay-neovim = inputs.neovim-nightly-overlay.overlay; - overlay-zig = _: prev: { zigpkgs = inputs.zig-overlay.packages.${prev.system}; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-arion overlay-neovim - overlay-zig overlay-nifoc ]; diff --git a/system/flakes/sail.nix b/system/flakes/sail.nix index adfa911..e5c6ca6 100644 --- a/system/flakes/sail.nix +++ b/system/flakes/sail.nix @@ -3,14 +3,12 @@ let overlay-arion = arion.overlay; overlay-neovim = inputs.neovim-nightly-overlay.overlay; - overlay-zig = _: prev: { zigpkgs = inputs.zig-overlay.packages.${prev.system}; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-arion overlay-neovim - overlay-zig overlay-nifoc ];