From 117ad124b8d32fd12c9aa9c146f6f27089c6cfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 16 Aug 2024 21:50:21 +0200 Subject: [PATCH 1/2] [chore] flake.lock: update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'lix-module/lix': 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?narHash=sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s%3D' (2024-08-12) → 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?narHash=sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s%3D&rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2' (2024-08-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4a92571f9207810b559c9eac203d1f4d79830073' (2024-08-13) → 'github:NixOS/nixpkgs/c3d4ac725177c030b1e289015989da2ad9d56af0' (2024-08-15) • Updated input 'nixvim': 'github:nix-community/nixvim/dbf6f7bc997dc3a9ab1f014ea075600357226950' (2024-08-12) → 'github:nix-community/nixvim/00f32f0430f82c74919c72af84bc95bf5ae434e4' (2024-08-16) • Updated input 'unstable': 'github:NixOS/nixpkgs/5a1fae64da2be3d09a8f289c6257146997827d1d' (2024-08-14) → 'github:NixOS/nixpkgs/03bd12dcf88b6aabc047fbf909bda4c7e344416c' (2024-08-15) --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 86c8990..4d8303a 100644 --- a/flake.lock +++ b/flake.lock @@ -320,7 +320,7 @@ "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2" }, "original": { "type": "tarball", @@ -350,11 +350,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723556749, - "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a92571f9207810b559c9eac203d1f4d79830073", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723481641, - "narHash": "sha256-9djT72/Ab2E3SpUbB3l0WmqZQ5mj05+LIVoorcjCWgE=", + "lastModified": 1723816538, + "narHash": "sha256-h37ltjdifkd7iLtMtBXSBBeYSTuBEKMW6ClFoC7nReQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "dbf6f7bc997dc3a9ab1f014ea075600357226950", + "rev": "00f32f0430f82c74919c72af84bc95bf5ae434e4", "type": "github" }, "original": { @@ -502,11 +502,11 @@ }, "unstable": { "locked": { - "lastModified": 1723599198, - "narHash": "sha256-kFB8EB7ne/ujWIa7pY6UmcwbGfwUCL6NTGJrglWva40=", + "lastModified": 1723764322, + "narHash": "sha256-1V4C7f7sUjslxreqbpvBzitl9I2nY7nOrR17DjnatcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a1fae64da2be3d09a8f289c6257146997827d1d", + "rev": "03bd12dcf88b6aabc047fbf909bda4c7e344416c", "type": "github" }, "original": { -- 2.47.0 From 2cdbd0e7dd2cc30f1e6f732875dadf4491c01384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 16 Aug 2024 22:02:23 +0200 Subject: [PATCH 2/2] [fix] nvim: Rust 1.80.0 broke silicon Known issue, it won't be fixed. Programs just need to update to a new version of `time-rs` (the affected dep). Waiting for https://github.com/Aloxaf/silicon/pull/254 to land so I can remove the dependency on the old version. --- flake.nix | 3 ++- nvim/standalone.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 0539d04..9fd2c8b 100644 --- a/flake.nix +++ b/flake.nix @@ -129,6 +129,7 @@ { # Get unstable packages unstable = unstablePkgs; + # Update vim plugins with the versions from unstable vimPlugins = prev.vimPlugins // unstablePkgs.vimPlugins; # Get specific packages from unstable @@ -228,7 +229,7 @@ devShells = forEachSupportedSystem ( { pkgs, system }: { - default = pkgs.mkShell { + default = pkgs.mkShellNoCC { buildInputs = [ pkgs.just self.packages.${system}.nvim diff --git a/nvim/standalone.nix b/nvim/standalone.nix index d870b25..b786eac 100644 --- a/nvim/standalone.nix +++ b/nvim/standalone.nix @@ -53,7 +53,8 @@ ]; # Formatting & linters extraPackages = [ - pkgs.unstable.silicon + # Rust 1.80.0 broke it, waiting for https://github.com/Aloxaf/silicon/pull/254 to be accepted + pkgs.silicon pkgs.unstable.alejandra pkgs.unstable.luajitPackages.jsregexp pkgs.unstable.statix -- 2.47.0