pyrox.dev / nixpkgs
lol
fork atom

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.

authored by

Julien Moutinho and committed by winter.bsky.social 664edda5 6cd880e0

+2 -24
unified split
-2
pkgs/applications/version-management/sourcehut/builds.nix
··· 54 54 --replace "all: api worker" "" 55 55 ''; 56 56 57 - nativeBuildInputs = srht.nativeBuildInputs; 58 - 59 57 propagatedBuildInputs = [ 60 58 srht 61 59 redis
+1 -1
pkgs/applications/version-management/sourcehut/core.nix
··· 52 52 patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch 53 53 ]; 54 54 55 - nativeBuildInputs = [ 55 + propagatedNativeBuildInputs = [ 56 56 sassc 57 57 nodejs 58 58 ];
-2
pkgs/applications/version-management/sourcehut/dispatch.nix
··· 18 18 sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8="; 19 19 }; 20 20 21 - nativeBuildInputs = srht.nativeBuildInputs; 22 - 23 21 propagatedBuildInputs = [ 24 22 srht 25 23 pyyaml
-2
pkgs/applications/version-management/sourcehut/git.nix
··· 63 63 --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" "" 64 64 ''; 65 65 66 - nativeBuildInputs = srht.nativeBuildInputs; 67 - 68 66 propagatedBuildInputs = [ 69 67 srht 70 68 pygit2
-2
pkgs/applications/version-management/sourcehut/hg.nix
··· 41 41 vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; 42 42 }; 43 43 44 - nativeBuildInputs = srht.nativeBuildInputs; 45 - 46 44 propagatedBuildInputs = [ 47 45 srht 48 46 hglib
-2
pkgs/applications/version-management/sourcehut/hub.nix
··· 15 15 sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w="; 16 16 }; 17 17 18 - nativeBuildInputs = srht.nativeBuildInputs; 19 - 20 18 propagatedBuildInputs = [ 21 19 srht 22 20 ];
-2
pkgs/applications/version-management/sourcehut/lists.nix
··· 35 35 --replace "all: api" "" 36 36 ''; 37 37 38 - nativeBuildInputs = srht.nativeBuildInputs; 39 - 40 38 propagatedBuildInputs = [ 41 39 srht 42 40 pygit2
-2
pkgs/applications/version-management/sourcehut/man.nix
··· 17 17 sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo="; 18 18 }; 19 19 20 - nativeBuildInputs = srht.nativeBuildInputs; 21 - 22 20 propagatedBuildInputs = [ 23 21 srht 24 22 pygit2
-2
pkgs/applications/version-management/sourcehut/meta.nix
··· 45 45 --replace "all: api" "" 46 46 ''; 47 47 48 - nativeBuildInputs = srht.nativeBuildInputs; 49 - 50 48 propagatedBuildInputs = [ 51 49 pgpy 52 50 srht
-2
pkgs/applications/version-management/sourcehut/paste.nix
··· 22 22 --replace "all: api" "" 23 23 ''; 24 24 25 - nativeBuildInputs = srht.nativeBuildInputs; 26 - 27 25 propagatedBuildInputs = [ 28 26 srht 29 27 pyyaml
-2
pkgs/applications/version-management/sourcehut/scm.nix
··· 18 18 sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w="; 19 19 }; 20 20 21 - nativeBuildInputs = srht.nativeBuildInputs; 22 - 23 21 propagatedBuildInputs = [ 24 22 srht 25 23 redis
+1 -3
pkgs/applications/version-management/sourcehut/todo.nix
··· 33 33 pname = "todosrht-api"; 34 34 modRoot = "api"; 35 35 vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; 36 - } // import ./fix-gqlgen-trimpath.nix {inherit unzip;}); 37 - 38 - nativeBuildInputs = srht.nativeBuildInputs; 36 + } // import ./fix-gqlgen-trimpath.nix { inherit unzip;}); 39 37 40 38 propagatedBuildInputs = [ 41 39 srht