Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sourcehut: fix build #198586

Closed
wants to merge 1 commit into from
Closed

sourcehut: fix build #198586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/builds.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ buildPythonPackage rec {
--replace "all: api worker" ""
'';

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
12 changes: 8 additions & 4 deletions pkgs/applications/version-management/sourcehut/core.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ buildPythonPackage rec {
patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch
];

nativeBuildInputs = [
sassc
nodejs
];
# We need to pass these inputs through to dependent services but we also don't want to pass through hooks, because we
# don't want non-idempotent hooks to run more than once (which would be possible because hooks get put in nativeBuildInputs)
nativeBuildInputs = passthru.sharedNativeBuildInputs;

propagatedBuildInputs = [
pgpy
Expand Down Expand Up @@ -92,6 +91,11 @@ buildPythonPackage rec {
dontUseSetuptoolsCheck = true;
pythonImportsCheck = [ "srht" ];

passthru.sharedNativeBuildInputs = [
sassc
nodejs
];

meta = with lib; {
homepage = "https://git.sr.ht/~sircmpwn/srht";
description = "Core modules for sr.ht";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/dispatch.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8=";
};

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/git.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ buildPythonPackage rec {
--replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" ""
'';

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/hg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ buildPythonPackage rec {
vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU=";
};

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/hub.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w=";
};

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/sourcehut/lists.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ buildPythonPackage rec {
pname = "listssrht-api";
modRoot = "api";
vendorSha256 = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip;});
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });

postPatch = ''
substituteInPlace Makefile \
--replace "all: api" ""
'';

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/man.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo=";
};

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/meta.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ buildPythonPackage rec {
--replace "all: api" ""
'';

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
pgpy
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/paste.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildPythonPackage rec {
--replace "all: api" ""
'';

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/sourcehut/scm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w=";
};

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/sourcehut/todo.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ buildPythonPackage rec {
pname = "todosrht-api";
modRoot = "api";
vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0=";
} // import ./fix-gqlgen-trimpath.nix {inherit unzip;});
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });

nativeBuildInputs = srht.nativeBuildInputs;
nativeBuildInputs = srht.sharedNativeBuildInputs;

propagatedBuildInputs = [
srht
Expand Down