From 721cdd4f1a25dfe39ec2603043d67042d1fb333f Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Tue, 1 Apr 2025 15:19:21 +0200 Subject: [PATCH] outputs: fix flake check for packages --- outputs.nix | 12 +++++++++--- pkgs/top-level/default.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/outputs.nix b/outputs.nix index e8fb8fa..3bb7787 100644 --- a/outputs.nix +++ b/outputs.nix @@ -20,9 +20,15 @@ self = { outPath = selfPath; modifiedNixpkgs = import ./pkgs/top-level/impure.nix; modifiedNixpkgsPure = import ./pkgs/top-level/default.nix; - packagesForSystem = system: self.modifiedNixpkgsPure { localSystem = system; }; - packages = forEachSystem (system: let - nixpkgs = import "${inputs.nixpkgs}/pkgs/top-level/default.nix" { localSystem = system; }; + packagesForSystem = system: self.modifiedNixpkgsPure { + inherit inputs; + localSystem = system; + }; + legacyPackages = forEachSystem (system: let + nixpkgs = import "${inputs.nixpkgs}/pkgs/top-level/default.nix" { + inherit inputs; + localSystem = system; + }; attrnames = builtins.attrNames nixpkgs; in builtins.removeAttrs (self.packagesForSystem system) attrnames diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 2ee6687..6dc792b 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -1,4 +1,4 @@ -{ inputs ? import ../../inputs.nix {} +{ inputs ? {} , uninitializedNixpkgs ? import "${inputs.nixpkgs}/pkgs/top-level/default.nix" , ... } @ args: