From 0e6a94d39996d6c2607dfd1cf2a32588e4095c88 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 6 Oct 2024 21:46:40 +0000 Subject: [PATCH] refactor: impure.nix calculates `localSystem` for itself; avoid duplication since otherwise integrations/nix-update/default.nix would need to add that too --- default.nix | 4 +--- impure.nix | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 977ae387f..49e2c31bb 100644 --- a/default.nix +++ b/default.nix @@ -2,6 +2,4 @@ let sane-nix-files = import ./pkgs/by-name/sane-nix-files/package.nix { }; in - import "${sane-nix-files}/impure.nix" ({ - localSystem = builtins.currentSystem; - } // args) + import "${sane-nix-files}/impure.nix" args diff --git a/impure.nix b/impure.nix index 7ca08e859..75b9f469c 100644 --- a/impure.nix +++ b/impure.nix @@ -4,7 +4,9 @@ # race conditions or eval failures. # # see default.nix for a wrapper around this with better purity guarantees. -{ localSystem }: +{ + localSystem ? builtins.currentSystem, +}: let mkPkgs = branch: args: ( (import ./pkgs/by-name/nixpkgs-bootstrap/${branch}.nix {}).override args