From ebcb5bf1709b818ffb893b83cb70163d1bf29d4f Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Thu, 26 Sep 2024 09:46:43 +0200 Subject: [PATCH] [Chore] Remove 'nixpkgs.overlay' from 'common' module Problem: For historical reasons this overlay existed and was using serokell-nix's 'inputs', which in some cases causes issues (see #101). However, nowadays, the overlay only provides utilities used by the CI/CD pipelines and thus there is no sense in using it system-wide. Solution: Remove 'nixpkgs.overlay' from 'common' module, remove 'inputs' from argument attrset for 'common' module as well. --- modules/common-non-darwin.nix | 2 +- modules/common.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/common-non-darwin.nix b/modules/common-non-darwin.nix index 2decac7..a01e32e 100644 --- a/modules/common-non-darwin.nix +++ b/modules/common-non-darwin.nix @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MPL-2.0 # configuration options that do not exist for nix-darwin -{ lib, pkgs, config, options, inputs, ... }: +{ lib, pkgs, config, options, ... }: { imports = [ ./services/nginx.nix diff --git a/modules/common.nix b/modules/common.nix index d5ece61..51ada44 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -1,8 +1,7 @@ # SPDX-FileCopyrightText: 2020 Serokell # # SPDX-License-Identifier: MPL-2.0 - -{ lib, pkgs, config, options, inputs, ... }: +{ lib, pkgs, config, options, ... }: { imports = [ ./ssh-hostkeys.nix @@ -36,9 +35,6 @@ ''; - nixpkgs.overlays = - [ (import ./../overlay) ]; - nix.nixPath = [ "nixpkgs=/etc/nix/nixpkgs" ]; # A hack to get around Nix not recognizing a runtime dependency on nixpkgs