From 664edda544f1ad938a3cb6444718a7e7ddfd8224 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 30 Oct 2022 21:58:28 +0100 Subject: sourcehut: fix #198478 The error: > Executing pythonOutputDistPhase > mv: cannot stat 'dist': No such file or directory was caused by the non-idempotent hook `pythonOutputDistHook` appearing in: 86ab83260fa002c3a0bab81d5965b6edff376759 and initially in: adbc59c9d3b6be2cdb1c29b84afa8b30d9cc7593 being run twice due to the manual propagation of `nativeBuildInputs` from sourcehut's core to sourcehut's services. Kudos to Winter (@winterqt) for making sense of this bug. --- pkgs/applications/version-management/sourcehut/builds.nix | 2 -- pkgs/applications/version-management/sourcehut/core.nix | 2 +- pkgs/applications/version-management/sourcehut/dispatch.nix | 2 -- pkgs/applications/version-management/sourcehut/git.nix | 2 -- pkgs/applications/version-management/sourcehut/hg.nix | 2 -- pkgs/applications/version-management/sourcehut/hub.nix | 2 -- pkgs/applications/version-management/sourcehut/lists.nix | 2 -- pkgs/applications/version-management/sourcehut/man.nix | 2 -- pkgs/applications/version-management/sourcehut/meta.nix | 2 -- pkgs/applications/version-management/sourcehut/paste.nix | 2 -- pkgs/applications/version-management/sourcehut/scm.nix | 2 -- pkgs/applications/version-management/sourcehut/todo.nix | 4 +--- 12 files changed, 2 insertions(+), 24 deletions(-) (limited to 'pkgs/applications/version-management/sourcehut') diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 1655ad28aaf9a..58e76d2028412 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -54,8 +54,6 @@ buildPythonPackage rec { --replace "all: api worker" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht redis diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index ff56c62c62e99..e31bc13c82ae1 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch ]; - nativeBuildInputs = [ + propagatedNativeBuildInputs = [ sassc nodejs ]; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index a2da28404ac92..05ed0450e0002 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pyyaml diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 1f76e5cb65f8f..5d7478b9440b4 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -63,8 +63,6 @@ buildPythonPackage rec { --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pygit2 diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index c1470c3fc5c6d..eb8fa966242a6 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -41,8 +41,6 @@ buildPythonPackage rec { vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht hglib diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 75d9efe5bd93d..6692cf60abaf8 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -15,8 +15,6 @@ buildPythonPackage rec { sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht ]; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index d981598a7b19a..da35977b15078 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -35,8 +35,6 @@ buildPythonPackage rec { --replace "all: api" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pygit2 diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 530101d573520..dadc508edd869 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -17,8 +17,6 @@ buildPythonPackage rec { sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pygit2 diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 4572fc81b2889..3707ed045447b 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -45,8 +45,6 @@ buildPythonPackage rec { --replace "all: api" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ pgpy srht diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index e31473bd34361..253ea8c0b9d67 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { --replace "all: api" "" ''; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht pyyaml diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 49eea05a7a7a2..1edc951cbed8b 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w="; }; - nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ srht redis diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 0278fb6bd1738..c0b01981bf077 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -33,9 +33,7 @@ buildPythonPackage rec { pname = "todosrht-api"; modRoot = "api"; vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; - } // import ./fix-gqlgen-trimpath.nix {inherit unzip;}); - - nativeBuildInputs = srht.nativeBuildInputs; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip;}); propagatedBuildInputs = [ srht -- cgit 1.4.1