Skip to content

Commit 9cdd2b7

Browse files
authored
strictly disable overlays (#17)
1 parent 42a1daf commit 9cdd2b7

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

mach_nix/generators/overlay_generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def _gen_imports(self):
4949
url = "https://github.com/nixos/nixpkgs/tarball/{self.nixpkgs_commit}";
5050
sha256 = "{self.nixpkgs_tarball_sha256}";
5151
}};
52-
pkgs = import nixpkgs_src {{ config = {{}}; }};
52+
pkgs = import nixpkgs_src {{ config = {{}}; overlays = []; }};
5353
python = pkgs.{self.py_ver_nix};
5454
"""
5555
return unindent(out, 12)
@@ -171,7 +171,7 @@ def _gen_python_env(self, pkgs: Dict[str, ResolvedPkg]):
171171
python_with_packages = f"""
172172
in
173173
174-
with import nixpkgs_src {{ overlays = [ overlay ]; }};
174+
with import nixpkgs_src {{ config = {{}}; overlays = [ overlay ]; }};
175175
176176
{self.py_ver_nix}.withPackages (ps: with ps; [
177177
{pkg_names.rstrip()}

mach_nix/nix/expression.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
}:
1212
let
1313
nixpkgs_src = (import ./nixpkgs-src.nix).stable;
14-
pkgs = import nixpkgs_src { config = {}; };
14+
pkgs = import nixpkgs_src { config = {}; overlays = []; };
1515
target_nixpkgs_src = builtins.fetchTarball {
1616
name = "nixpkgs";
1717
url = "https://github.com/nixos/nixpkgs/tarball/${nixpkgs_commit}";
1818
sha256 = "${nixpkgs_tarball_sha256}";
1919
};
20-
target_pkgs = import target_nixpkgs_src { config = {}; };
20+
target_pkgs = import target_nixpkgs_src { config = {}; overlays = []; };
2121
target_python = target_pkgs."${python_attr}";
2222
nixpkgs_json = import ./nixpkgs-json.nix { pkgs = target_pkgs; python = target_python; };
2323
builder_python = pkgs.python37.withPackages(ps:

0 commit comments

Comments
 (0)