From 71e76e809c96cf12b6b836fc2f52cfab81c40114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 2 Aug 2024 23:11:07 +0200 Subject: [PATCH] [fix] flake: override nixpkgs in nuschtosSearch otherwise we are using nixpkgs twice --- flake.lock | 26 ++++++-------------------- flake.nix | 5 ++++- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 4c2d43f..7733459 100644 --- a/flake.lock +++ b/flake.lock @@ -363,22 +363,6 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -418,14 +402,16 @@ "lix-module", "flake-utils" ], - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1722144272, - "narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=", + "lastModified": 1722493084, + "narHash": "sha256-ktjl908zZKWcGdMyz6kX1kHSg7LFFGPYBvTi9FgQleM=", "owner": "NuschtOS", "repo": "search", - "rev": "16565307c267ec219c2b5d3494ba66df08e7d403", + "rev": "3f5abffa5f28b4ac3c9212c81c5e8d2d22876071", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3f11370..b89b44d 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,10 @@ nix-darwin.follows = ""; # disable MacOS stuff home-manager.follows = "home-manager"; flake-compat.follows = "stylix/flake-compat"; - nuschtosSearch.inputs.flake-utils.follows = "lix-module/flake-utils"; + nuschtosSearch.inputs = { + flake-utils.follows = "lix-module/flake-utils"; + nixpkgs.follows = "nixpkgs"; + }; }; }; # For deduplication