From ad454c1708cc2bb2ac82fbeb6af5210c8411d3c2 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 30 Apr 2023 12:25:03 -0400 Subject: [PATCH 1/3] or-tools: remove dev output or-tools has buggy CMake scripts that don't pick up on the proper install locations. This needs to fixed upstream, but I don't have time to do this right now. Removing the dev output will cause cross-compiled builds to have build platform contamination due to propagated native protobuf. --- pkgs/development/libraries/science/math/or-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 6d23008b6922..92588307ca57 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { pip install --prefix="$python" python/ ''; - outputs = [ "out" "dev" "python" ]; + outputs = [ "out" "python" ]; meta = with lib; { homepage = "https://github.com/google/or-tools"; From bf02d717b59667cb7abc9c4a1c279ccdcd33c99a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 30 Apr 2023 12:29:02 -0400 Subject: [PATCH 2/3] python3Packages.protobuf: remove dev output Apparently some things don't handle Python packages with dev outputs correctly. This will fix those packages but will cause build-platform contamination for cross-compiled packages that use protobuf (due to propagatedNativeBuildInputs). --- pkgs/development/python-modules/protobuf/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 68177357ca6d..8df8bb7c4a7d 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -41,8 +41,6 @@ buildPythonPackage { fi ''; - outputs = [ "out" "dev" ]; - buildInputs = [ protobuf ]; propagatedNativeBuildInputs = [ From b02988a87c25347c863b5d6f7cc3eb1e2fbc8031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 1 May 2023 10:09:47 +0200 Subject: [PATCH 3/3] Revert "python310Packages.aioesphomeapi: Propagate protobuf dev output" This reverts commit d5edd07a01397450e9faebf6a68adb01330364fa. The .dev output was removed in the parent commit. --- pkgs/development/python-modules/aioesphomeapi/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index d9f02f883e34..bee7cc393321 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -28,8 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout noiseprotocol - protobuf.out - protobuf.dev + protobuf zeroconf ];