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: 86ab83260f
and initially in: adbc59c9d3
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.
This commit is contained in:
Julien Moutinho 2022-10-30 21:58:28 +01:00 committed by Winter
parent 6cd880e0e5
commit 664edda544
12 changed files with 2 additions and 24 deletions

View file

@ -54,8 +54,6 @@ buildPythonPackage rec {
--replace "all: api worker" ""
'';
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
redis

View file

@ -52,7 +52,7 @@ buildPythonPackage rec {
patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch
];
nativeBuildInputs = [
propagatedNativeBuildInputs = [
sassc
nodejs
];

View file

@ -18,8 +18,6 @@ buildPythonPackage rec {
sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8=";
};
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
pyyaml

View file

@ -63,8 +63,6 @@ buildPythonPackage rec {
--replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" ""
'';
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
pygit2

View file

@ -41,8 +41,6 @@ buildPythonPackage rec {
vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU=";
};
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
hglib

View file

@ -15,8 +15,6 @@ buildPythonPackage rec {
sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w=";
};
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
];

View file

@ -35,8 +35,6 @@ buildPythonPackage rec {
--replace "all: api" ""
'';
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
pygit2

View file

@ -17,8 +17,6 @@ buildPythonPackage rec {
sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo=";
};
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
pygit2

View file

@ -45,8 +45,6 @@ buildPythonPackage rec {
--replace "all: api" ""
'';
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
pgpy
srht

View file

@ -22,8 +22,6 @@ buildPythonPackage rec {
--replace "all: api" ""
'';
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
pyyaml

View file

@ -18,8 +18,6 @@ buildPythonPackage rec {
sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w=";
};
nativeBuildInputs = srht.nativeBuildInputs;
propagatedBuildInputs = [
srht
redis

View file

@ -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