diff options
author | Julien Moutinho <julm+nixpkgs@sourcephile.fr> | 2022-10-30 21:58:28 +0100 |
---|---|---|
committer | Winter <winter@winter.cafe> | 2022-11-01 21:56:37 -0400 |
commit | 664edda544f1ad938a3cb6444718a7e7ddfd8224 (patch) | |
tree | 0b4679d178f8a3116af0d932e24fecc0e1eda34e | |
parent | 6cd880e0e57b51e9d6fcc65767a5331cdba4605a (diff) | |
download | nixpkgs-664edda544f1ad938a3cb6444718a7e7ddfd8224.tar nixpkgs-664edda544f1ad938a3cb6444718a7e7ddfd8224.tar.gz nixpkgs-664edda544f1ad938a3cb6444718a7e7ddfd8224.tar.bz2 nixpkgs-664edda544f1ad938a3cb6444718a7e7ddfd8224.tar.lz nixpkgs-664edda544f1ad938a3cb6444718a7e7ddfd8224.tar.xz nixpkgs-664edda544f1ad938a3cb6444718a7e7ddfd8224.tar.zst nixpkgs-664edda544f1ad938a3cb6444718a7e7ddfd8224.zip |
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.
12 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 1655ad28aaf..58e76d20284 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 ff56c62c62e..e31bc13c82a 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 a2da28404ac..05ed0450e00 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 1f76e5cb65f..5d7478b9440 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 c1470c3fc5c..eb8fa966242 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 75d9efe5bd9..6692cf60aba 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 d981598a7b1..da35977b150 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 530101d5735..dadc508edd8 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 4572fc81b28..3707ed04544 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 e31473bd343..253ea8c0b9d 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 49eea05a7a7..1edc951cbed 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 0278fb6bd17..c0b01981bf0 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 |