From db7017362776cd04fc07ae89ec2d00f247df5ecd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 15 Jan 2019 13:11:09 +0100 Subject: [PATCH] Revert "nixos/modules/misc/nixpkgs.nix: Use pure Nixpkgs function" As a workaround for #51025 and https://github.com/NixOS/nix/issues/1232 This reverts commit 5f894a67f565129ac683434c3040ba85c2df3750. --- nixos/modules/misc/nixpkgs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 93fbf16841e5..3a717fddaba2 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -55,7 +55,7 @@ let check = builtins.isAttrs; }; - defaultPkgs = import ../../../pkgs/top-level/default.nix { + defaultPkgs = import ../../.. { inherit (cfg) config overlays localSystem crossSystem; }; @@ -68,7 +68,7 @@ in pkgs = mkOption { defaultText = literalExample - ''import "''${nixos}/../pkgs/top-level" { + ''import "''${nixos}/.." { inherit (cfg) config overlays localSystem crossSystem; } '';