From f80e8658c7750926a11f50ad1dfd74fb505ba273 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 9 Feb 2025 11:00:51 +0100 Subject: [PATCH 1/3] chore(deps): lock file maintenance --- flake.lock | 24 ++++++++++++------------ scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 882b31a..13b118a 100644 --- a/flake.lock +++ b/flake.lock @@ -281,11 +281,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1738622717, - "narHash": "sha256-XSFbbhN8xdr4qKRFbubXJ3vkSusKSnALf69G9fdGPXE=", + "lastModified": 1738966895, + "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", "owner": "nix-community", "repo": "nixvim", - "rev": "6288354d43ada972480cbd10dc7102637eeafc1e", + "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1738070913, - "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { @@ -471,11 +471,11 @@ }, "unstable": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 5b1dc0a..63b34d5 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "os_pipe" diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index dd9d725..a03da12 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -384,9 +384,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "os_pipe" From 767e5f500ac6d96fb0e39da5a783ac5a8655f744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 9 Feb 2025 12:37:42 +0100 Subject: [PATCH 2/3] fix(flake): use nixvim's nixpkgs instead of our own This ensures the `nixpkgs-unstable` we consume is tested against `nixvim`. --- flake-modules/nvim.nix | 2 -- flake.lock | 47 +++++++++++++++++++++--------------------- flake.nix | 6 ++++-- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix index 7e5e988..75fd4e8 100644 --- a/flake-modules/nvim.nix +++ b/flake-modules/nvim.nix @@ -1,7 +1,5 @@ { inputs, ... }: { - flake.overlays.nixvim = inputs.nixvim.overlays.default; - perSystem = { lib, system, ... }: let diff --git a/flake.lock b/flake.lock index 882b31a..aa6cb28 100644 --- a/flake.lock +++ b/flake.lock @@ -295,6 +295,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": [], @@ -307,20 +323,18 @@ "home-manager" ], "nix-darwin": [], - "nixpkgs": [ - "unstable" - ], + "nixpkgs": "nixpkgs_2", "nuschtosSearch": [], "treefmt-nix": [ "treefmt-nix" ] }, "locked": { - "lastModified": 1738622717, - "narHash": "sha256-XSFbbhN8xdr4qKRFbubXJ3vkSusKSnALf69G9fdGPXE=", + "lastModified": 1738966895, + "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", "owner": "nix-community", "repo": "nixvim", - "rev": "6288354d43ada972480cbd10dc7102637eeafc1e", + "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", "type": "github" }, "original": { @@ -339,7 +353,10 @@ "stylix": "stylix", "systems": "systems", "treefmt-nix": "treefmt-nix", - "unstable": "unstable" + "unstable": [ + "nixvim", + "nixpkgs" + ] } }, "stylix": { @@ -468,22 +485,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "unstable": { - "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b852838..2e99a7b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,13 @@ # A helpful description of your flake description = "My NixOS configuration"; + # Trick renovate into accepting this lockfile (see https://github.com/renovatebot/renovate/issues/29721) + # "github:NixOS/nixpkgs/nixos-unstable" + # Flake inputs inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + unstable.follows = "nixvim/nixpkgs"; # Lix lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; @@ -35,7 +38,6 @@ nixvim = { url = "github:nix-community/nixvim"; inputs = { - nixpkgs.follows = "unstable"; home-manager.follows = "home-manager"; flake-parts.follows = "flake-parts"; treefmt-nix.follows = "treefmt-nix"; From 4f82dc4918cf96c49149a575d575e9d94fa136fb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 9 Feb 2025 13:20:13 +0100 Subject: [PATCH 3/3] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index aa6cb28..ae597c1 100644 --- a/flake.lock +++ b/flake.lock @@ -281,11 +281,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "type": "github" }, "original": { @@ -473,11 +473,11 @@ ] }, "locked": { - "lastModified": 1738070913, - "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 5b1dc0a..63b34d5 100644 --- a/scripts/audiomenu/Cargo.lock +++ b/scripts/audiomenu/Cargo.lock @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "os_pipe" diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index dd9d725..a03da12 100644 --- a/scripts/jpassmenu/Cargo.lock +++ b/scripts/jpassmenu/Cargo.lock @@ -384,9 +384,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "os_pipe"