From 494522a2a4bd2f0efc86b2d48e0a9cd987680c05 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 11 Aug 2023 23:39:00 +0400 Subject: [PATCH] treewide: noop: refer to `src.name` or similar in `sourceRoot` where appropriate, part 4: leftovers (#248528) This continues where eaafc0f7eabfcc7dfea4387d98dcb9881e12755e. --- pkgs/development/python-modules/dbt-core/default.nix | 2 +- pkgs/development/python-modules/dbt-postgres/default.nix | 2 +- pkgs/development/python-modules/langchain/default.nix | 2 +- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- pkgs/development/python-modules/opentelemetry-api/default.nix | 4 ++-- .../opentelemetry-exporter-otlp-proto-common/default.nix | 2 +- .../opentelemetry-exporter-otlp-proto-grpc/default.nix | 2 +- .../opentelemetry-exporter-otlp-proto-http/default.nix | 2 +- .../python-modules/opentelemetry-exporter-otlp/default.nix | 2 +- .../opentelemetry-exporter-prometheus/default.nix | 2 +- .../opentelemetry-instrumentation-aiohttp-client/default.nix | 2 +- .../opentelemetry-instrumentation-asgi/default.nix | 2 +- .../opentelemetry-instrumentation-django/default.nix | 2 +- .../opentelemetry-instrumentation-grpc/default.nix | 2 +- .../opentelemetry-instrumentation-wsgi/default.nix | 2 +- .../python-modules/opentelemetry-instrumentation/default.nix | 2 +- .../python-modules/opentelemetry-proto/default.nix | 2 +- pkgs/development/python-modules/opentelemetry-sdk/default.nix | 2 +- .../opentelemetry-semantic-conventions/default.nix | 2 +- .../python-modules/opentelemetry-test-utils/default.nix | 2 +- .../python-modules/opentelemetry-util-http/default.nix | 2 +- pkgs/development/python-modules/prophet/default.nix | 2 +- pkgs/misc/moonfire-nvr/default.nix | 4 ++-- pkgs/tools/misc/fx-cast-bridge/default.nix | 2 +- 24 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index bd346c3262d7..0a926744a814 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { hash = "sha256-ZgP11fVMtXpzo9QaTkejvKl0LzCAkIyGBMcOquBirxQ="; }; - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; nativeBuildInputs = [ pythonRelaxDepsHook diff --git a/pkgs/development/python-modules/dbt-postgres/default.nix b/pkgs/development/python-modules/dbt-postgres/default.nix index f5be13ccff7a..0478e748f1c6 100644 --- a/pkgs/development/python-modules/dbt-postgres/default.nix +++ b/pkgs/development/python-modules/dbt-postgres/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { inherit (dbt-core) version src; - sourceRoot = "source/plugins/postgres"; + sourceRoot = "${dbt-core.src.name}/plugins/postgres"; env.DBT_PSYCOPG2_NAME = "psycopg2"; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 0a2f4ecf46ef..d03ce98f2fe7 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { hash = "sha256-YQFIF1tA/CjvmD6xGgVre2lbcHR+UYx/sy1dOfpvkPY="; }; - sourceRoot = "source/libs/langchain"; + sourceRoot = "${src.name}/libs/langchain"; postPatch = '' substituteInPlace langchain/utilities/bash.py \ diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index af1a1c1afeac..910ba98e8815 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -8,7 +8,7 @@ , pytest-asyncio }: -buildPythonPackage { +buildPythonPackage rec { pname = "langsmith"; version = "0.0.14"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage { hash = "sha256-U8fs16Uq80EB7Ey5YuQhUKKI9DOXJWlabM5JdoDnWP0="; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 2a4de0a92cc9..1ccb00617ac0 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -12,7 +12,7 @@ }: let - self = buildPythonPackage { + self = buildPythonPackage rec { pname = "opentelemetry-api"; version = "1.18.0"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ let hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q="; }; - sourceRoot = "source/opentelemetry-api"; + sourceRoot = "${src.name}/opentelemetry-api"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index a786318a58ba..71c742c0ba2a 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-otlp-proto-common"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-common"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-common"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index d4f2f4c4305b..b727d16b8e65 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-otlp-proto-grpc"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-grpc"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-grpc"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index 6d7bf23dafa3..2478826cd67e 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-otlp-proto-http"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-http"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-http"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index a3606148883f..7dcc282e1536 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-otlp"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-otlp"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index 1e74b3fd502f..7708b404a980 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-prometheus"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-prometheus"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-prometheus"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index de0823c0aac9..cdd40d447050 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-aiohttp-client"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-aiohttp-client"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-aiohttp-client"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 5777498873b7..952824cd1b72 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-asgi"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-asgi"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-asgi"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index ec19eacf0e3d..39058d16e259 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-django"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-django"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-django"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 8313faa8d6dd..ad408c3dfbaa 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-grpc"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-grpc"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-grpc"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index 408cfb692329..0b1fda0276c9 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-wsgi"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-wsgi"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-wsgi"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 8716ef4efede..331a5e864374 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; }; - sourceRoot = "source/opentelemetry-instrumentation"; + sourceRoot = "${src.name}/opentelemetry-instrumentation"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index c673dee3986b..21b84dd5898f 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { pname = "opentelemetry-proto"; disabled = pythonOlder "3.7"; - sourceRoot = "source/opentelemetry-proto"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 1b4683137d95..ba5e7de5db83 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -17,7 +17,7 @@ let pname = "opentelemetry-sdk"; disabled = pythonOlder "3.7"; - sourceRoot = "source/opentelemetry-sdk"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-sdk"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix index 0ae9fb34d06f..d57a7f13fa53 100644 --- a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix +++ b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { pname = "opentelemetry-semantic-conventions"; disabled = pythonOlder "3.7"; - sourceRoot = "source/opentelemetry-semantic-conventions"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-semantic-conventions"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index 71e87b0737a9..4e2405058b86 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { pname = "opentelemetry-test-utils"; disabled = pythonOlder "3.7"; - sourceRoot = "source/tests/opentelemetry-test-utils"; + sourceRoot = "${opentelemetry-api.src.name}/tests/opentelemetry-test-utils"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index 49ec52a380b0..85e28f2a6d49 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "opentelemetry-util-http"; disabled = pythonOlder "3.7"; - sourceRoot = "source/util/opentelemetry-util-http"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/util/opentelemetry-util-http"; format = "pyproject"; diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 7bb71fb778b6..889f835861ed 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { }) ]; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; env.PROPHET_REPACKAGE_CMDSTAN = "false"; diff --git a/pkgs/misc/moonfire-nvr/default.nix b/pkgs/misc/moonfire-nvr/default.nix index 27b7ae7766db..8c9de0e7da9d 100644 --- a/pkgs/misc/moonfire-nvr/default.nix +++ b/pkgs/misc/moonfire-nvr/default.nix @@ -21,7 +21,7 @@ let ui = buildNpmPackage { inherit version src; pname = "${pname}-ui"; - sourceRoot = "source/ui"; + sourceRoot = "${src.name}/ui"; npmDepsHash = "sha256-IpZWgMo6Y3vRn9h495ifMB3tQxobLeTLC0xXS1vrKLA="; installPhase = '' runHook preInstall @@ -34,7 +34,7 @@ let in rustPlatform.buildRustPackage { inherit pname version src; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/tools/misc/fx-cast-bridge/default.nix b/pkgs/tools/misc/fx-cast-bridge/default.nix index c67289fb822b..5f2274101e56 100644 --- a/pkgs/tools/misc/fx-cast-bridge/default.nix +++ b/pkgs/tools/misc/fx-cast-bridge/default.nix @@ -10,7 +10,7 @@ buildNpmPackage rec { rev = "v${version}"; hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg="; }; - sourceRoot = "source/app"; + sourceRoot = "${src.name}/app"; npmDepsHash = "sha256-GLrDRZqKcX1PDGREx+MLZ1TEjr88r9nz4TvZ9nvo40g="; nativeBuildInputs = [ python3 ];