Skip to content

check-meta.nix: make non-source consistent with documentation #175495

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

Merged
piegamesde merged 2 commits into from Jan 4, 2023
Merged

check-meta.nix: make non-source consistent with documentation #175495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
607d59f
check-meta.nix: make non-source consistent with documentation
May 30, 2022
30bf726
fix packages with broken meta attributes
Jan 2, 2023
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/development/tools/database/apgdiff/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
homepage = "https://apgdiff.com";
license = licenses.mit;
inherit (jre.meta) platforms;
sourceProvenance = sourceTypes.binaryBytecode;
sourceProvenance = [ sourceTypes.binaryBytecode ];
maintainers = [ maintainers.misterio77 ];
};
})
2 changes: 1 addition & 1 deletion pkgs/games/itch/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/itchio/itch";
license = licenses.mit;
platforms = platforms.linux;
sourceProvenance = lib.sourceTypes.binaryBytecode;
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
maintainers = with maintainers; [ pasqui23 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/onlyoffice-documentserver/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ let
homepage = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors";
license = licenses.agpl3;
platforms = [ "x86_64-linux" ];
sourceProvenance = sourceTypes.binaryNativeCode;
sourceProvenance = [ sourceTypes.binaryNativeCode ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
};
Expand Down
6 changes: 3 additions & 3 deletions pkgs/stdenv/generic/check-meta.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ let

hasNonSourceProvenance = attrs:
(attrs ? meta.sourceProvenance) &&
isNonSource (lib.lists.toList attrs.meta.sourceProvenance);
isNonSource attrs.meta.sourceProvenance;

# Allow granular checks to allow only some non-source-built packages
# Example:
# { pkgs, ... }:
# {
# allowNonSource = false;
# allowNonSourcePredicate = with pkgs.lib.lists; pkg: !(any (p: !p.isSource && p != lib.sourceTypes.binaryFirmware) (toList pkg.meta.sourceProvenance));
# allowNonSourcePredicate = with pkgs.lib.lists; pkg: !(any (p: !p.isSource && p != lib.sourceTypes.binaryFirmware) pkg.meta.sourceProvenance);
# }
allowNonSourcePredicate = config.allowNonSourcePredicate or (x: false);

Expand Down Expand Up @@ -269,7 +269,7 @@ let
license = let
licenseType = either (attrsOf anything) str; # TODO disallow `str` licenses, use a module
in either licenseType (listOf licenseType);
sourceProvenance = either (listOf (attrsOf anything)) (attrsOf anything);
sourceProvenance = listOf lib.types.attrs;
maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix
priority = int;
platforms = listOf str;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/admin/pulumi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://pulumi.io/";
description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
sourceProvenance = sourceTypes.fromSource;
sourceProvenance = [ sourceTypes.fromSource ];
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [
Expand Down