From 12c232030c92f6a2a0ce0026ad0ca391273b3045 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Dec 2021 10:54:13 -0500 Subject: [PATCH 1/2] overrides: matplotlib: use MPLSETUPCFG This modifies the override to be forward compatible with the upstream change https://github.com/NixOS/nixpkgs/commit/7dc44307515de130daf661814891d8844fdf701f --- overrides.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/overrides.nix b/overrides.nix index d70c013..1cd440e 100644 --- a/overrides.nix +++ b/overrides.nix @@ -779,18 +779,13 @@ self: super: self.setuptools-scm-git-archive ]; - postPatch = '' - cat > '' + - (if lib.versionAtLeast super.matplotlib.version "3.5.0" then "mplsetup.cfg" else "setup.cfg") + - '' < Date: Thu, 16 Dec 2021 13:33:34 -0500 Subject: [PATCH 2/2] !fixup --- overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides.nix b/overrides.nix index 1cd440e..790ee85 100644 --- a/overrides.nix +++ b/overrides.nix @@ -779,7 +779,7 @@ self: super: self.setuptools-scm-git-archive ]; - MPLSETUPCFG = writeText "mplsetup.cfg" '' + MPLSETUPCFG = pkgs.writeText "mplsetup.cfg" '' [libs] system_freetype = True system_qhull = True