From 90d6500e2ceeb9a4ee269e87d55f011ff5464acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kobsch=C3=A4tzki?= Date: Wed, 23 Aug 2023 15:35:45 +0200 Subject: [PATCH 1/4] fix: Add pycurl override with pkgs.curl --- overrides/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/overrides/default.nix b/overrides/default.nix index 42891a506..52c244a27 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -2016,6 +2016,12 @@ lib.composeManyExtensions [ } ); + pycurl = super.pycurl.overridePythonAttrs ( + old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.curl ]; + } + ); + pydantic-core = super.pydantic-core.override { preferWheel = true; }; From 3ea44284f47d81129b871d70abe95d10a59e9a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kobsch=C3=A4tzki?= Date: Wed, 23 Aug 2023 15:38:31 +0200 Subject: [PATCH 2/4] fix: Add pycurl override with pkgs.curl (2) --- overrides/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/overrides/default.nix b/overrides/default.nix index 52c244a27..d4b757b57 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -2019,6 +2019,7 @@ lib.composeManyExtensions [ pycurl = super.pycurl.overridePythonAttrs ( old: { propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.curl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.curl ]; } ); From 7650ff32685a298c80f6e713126452002ff32966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kobsch=C3=A4tzki?= Date: Wed, 23 Aug 2023 15:43:32 +0200 Subject: [PATCH 3/4] fix: change from buildInputs to nativeBuildInputs --- overrides/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/default.nix b/overrides/default.nix index d4b757b57..3e3c07e49 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -2019,7 +2019,7 @@ lib.composeManyExtensions [ pycurl = super.pycurl.overridePythonAttrs ( old: { propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.curl ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.curl ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.curl ]; } ); From 1217cfbf01caafd81ae9bec3f84f503610d5fab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kobsch=C3=A4tzki?= Date: Tue, 12 Sep 2023 12:20:26 +0200 Subject: [PATCH 4/4] fix(pycurl): change from propagatedBuildInputs -> buildInputs --- overrides/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/default.nix b/overrides/default.nix index 3e3c07e49..5d83bb269 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -2018,7 +2018,7 @@ lib.composeManyExtensions [ pycurl = super.pycurl.overridePythonAttrs ( old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.curl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.curl ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.curl ]; } );