From b56aae444d468fa26a661a106a0c33bd10c1da2c Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 1 Oct 2024 09:53:38 +0000 Subject: [PATCH] MASSIVELY reduce eval time for cross-compiled hosts (i.e. moby) moby eval time is reduced from ~3m to 17s --- ...24-10-01-python-cross-resource-usage.patch | 23 +++++++++++++++++++ pkgs/additional/nixpkgs/list.nix | 6 +---- 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 pkgs/additional/nixpkgs/2024-10-01-python-cross-resource-usage.patch diff --git a/pkgs/additional/nixpkgs/2024-10-01-python-cross-resource-usage.patch b/pkgs/additional/nixpkgs/2024-10-01-python-cross-resource-usage.patch new file mode 100644 index 000000000..98c8e1cd4 --- /dev/null +++ b/pkgs/additional/nixpkgs/2024-10-01-python-cross-resource-usage.patch @@ -0,0 +1,23 @@ +commit bd996f1383845e255fb7efddd044996fcf45d578 (HEAD -> 2024-09-30-python-cross-fix) +Author: Colin +Date: 2024-10-01 09:44:35 +0000 + + NOT FOR MERGE: reduce resource usage for cross-compiled python + + this breaks `python.override { ... }` + + for context, see: + +diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix +index bb3dba534b79..4e0e2ced6e6b 100644 +--- a/pkgs/development/interpreters/python/cpython/default.nix ++++ b/pkgs/development/interpreters/python/cpython/default.nix +@@ -132,7 +132,7 @@ let + # When we override the interpreter we also need to override the spliced versions of the interpreter + # bluez is excluded manually to break an infinite recursion. + inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && ! lib.isDerivation v) inputs; +- override = attr: let python = attr.override (inputs' // { self = python; }); in python; ++ override = attr: attr; + in passthruFun rec { + inherit self sourceVersion packageOverrides; + implementation = "cpython"; diff --git a/pkgs/additional/nixpkgs/list.nix b/pkgs/additional/nixpkgs/list.nix index 316204667..9b0de50d3 100644 --- a/pkgs/additional/nixpkgs/list.nix +++ b/pkgs/additional/nixpkgs/list.nix @@ -29,11 +29,7 @@ let ); in [ - # (fetchpatch' { - # title = "pantheon.switchboard-plug-sound: support cross compilation"; - # saneCommit = "86f85de8d008710a11b7b3653ec594438374059e"; - # hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE="; - # }) + ./2024-10-01-python-cross-resource-usage.patch (fetchpatch' { title = "nixos/pam: replace apparmor warnings with assertions";