Merge pull request #175495 from amjoseph-nixpkgs/pr/sourceProvenance/correct-meta-typecheck
check-meta.nix: make non-source consistent with documentation
This commit is contained in:
commit
aa8ead30fd
@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||||||
homepage = "https://apgdiff.com";
|
homepage = "https://apgdiff.com";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
inherit (jre.meta) platforms;
|
inherit (jre.meta) platforms;
|
||||||
sourceProvenance = sourceTypes.binaryBytecode;
|
sourceProvenance = [ sourceTypes.binaryBytecode ];
|
||||||
maintainers = [ maintainers.misterio77 ];
|
maintainers = [ maintainers.misterio77 ];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
@ -93,7 +93,7 @@ stdenvNoCC.mkDerivation rec {
|
|||||||
homepage = "https://github.com/itchio/itch";
|
homepage = "https://github.com/itchio/itch";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
sourceProvenance = lib.sourceTypes.binaryBytecode;
|
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||||
maintainers = with maintainers; [ pasqui23 ];
|
maintainers = with maintainers; [ pasqui23 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -144,7 +144,7 @@ let
|
|||||||
homepage = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors";
|
homepage = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors";
|
||||||
license = licenses.agpl3;
|
license = licenses.agpl3;
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
sourceProvenance = sourceTypes.binaryNativeCode;
|
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -93,14 +93,14 @@ let
|
|||||||
|
|
||||||
hasNonSourceProvenance = attrs:
|
hasNonSourceProvenance = attrs:
|
||||||
(attrs ? meta.sourceProvenance) &&
|
(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
|
# Allow granular checks to allow only some non-source-built packages
|
||||||
# Example:
|
# Example:
|
||||||
# { pkgs, ... }:
|
# { pkgs, ... }:
|
||||||
# {
|
# {
|
||||||
# allowNonSource = false;
|
# 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);
|
allowNonSourcePredicate = config.allowNonSourcePredicate or (x: false);
|
||||||
|
|
||||||
@ -269,7 +269,7 @@ let
|
|||||||
license = let
|
license = let
|
||||||
licenseType = either (attrsOf anything) str; # TODO disallow `str` licenses, use a module
|
licenseType = either (attrsOf anything) str; # TODO disallow `str` licenses, use a module
|
||||||
in either licenseType (listOf licenseType);
|
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
|
maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix
|
||||||
priority = int;
|
priority = int;
|
||||||
platforms = listOf str;
|
platforms = listOf str;
|
||||||
|
@ -109,7 +109,7 @@ buildGoModule rec {
|
|||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://pulumi.io/";
|
homepage = "https://pulumi.io/";
|
||||||
description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
|
description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
|
||||||
sourceProvenance = sourceTypes.fromSource;
|
sourceProvenance = [ sourceTypes.fromSource ];
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [
|
maintainers = with maintainers; [
|
||||||
|
Loading…
Reference in New Issue
Block a user