Skip to content

Commit

Permalink
[Chore] Remove 'nixpkgs.overlay' from 'common' module
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rvem committed Sep 26, 2024
1 parent 34f3593 commit ebcb5bf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion modules/common-non-darwin.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions modules/common.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# SPDX-FileCopyrightText: 2020 Serokell <https://serokell.io/>
#
# SPDX-License-Identifier: MPL-2.0

{ lib, pkgs, config, options, inputs, ... }:
{ lib, pkgs, config, options, ... }:
{
imports = [
./ssh-hostkeys.nix
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ebcb5bf

Please sign in to comment.