From fab00092df0130b163bcc07e1336bf7144086d38 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Tue, 14 Jan 2025 18:19:26 -0800 Subject: [PATCH] fix: Let MarleyVim use its own nixpkgs version --- flake.lock | 26 ++++++++++++++++++++------ flake.nix | 5 +---- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index e3b59e3..3fcfd07 100644 --- a/flake.lock +++ b/flake.lock @@ -578,9 +578,7 @@ "neotab-nvim": "neotab-nvim", "neovim-nightly": "neovim-nightly", "nerdy-nvim": "nerdy-nvim", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "nvim-emmet": "nvim-emmet" }, "locked": { @@ -738,6 +736,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1736523798, "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", @@ -753,7 +767,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -830,7 +844,7 @@ "lix": "lix", "marleyvim": "marleyvim", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur", "rofi-themes": "rofi-themes", "rose-pine": "rose-pine", @@ -876,7 +890,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "utils": "utils" }, "locked": { diff --git a/flake.nix b/flake.nix index 2a57074..24bab85 100644 --- a/flake.nix +++ b/flake.nix @@ -78,10 +78,7 @@ rose-pine.url = "git+https://codewith.babesonthe.net/punkfairie/rose-pine-nix"; - marleyvim = { - url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + marleyvim.url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim"; wezterm = { url = "github:wez/wezterm?dir=nix";