From ffd38a704453e3c51df2697d5f8d7cf6ea38718b Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Tue, 12 Nov 2024 21:54:58 +0000 Subject: [PATCH] xen: resolve some TODO comments - Migrates to the new platform declaration style. - Removes the separate output TODO, as it is an impossible task. - Removes some superfluous comments. Signed-off-by: Fernando Rodrigues --- pkgs/build-support/xen/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/xen/default.nix b/pkgs/build-support/xen/default.nix index 91c8d3a29d3e..54ec0204790a 100644 --- a/pkgs/build-support/xen/default.nix +++ b/pkgs/build-support/xen/default.nix @@ -75,6 +75,7 @@ let # Inherit helper functions from lib and builtins. inherit (builtins) elemAt isAttrs; + inherit (lib.systems.inspect.patterns) isLinux isAarch64; inherit (lib.strings) concatLines enableFeature @@ -83,7 +84,6 @@ let removeSuffix versionOlder ; - inherit (lib.platforms) linux aarch64; inherit (lib) teams; inherit (lib.licenses) cc-by-40 @@ -207,8 +207,6 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname version; - # TODO: Split $out in $bin for binaries and $lib for libraries. - # TODO: Python package to be in separate output/package. outputs = [ "out" "man" @@ -217,7 +215,6 @@ stdenv.mkDerivation (finalAttrs: { "boot" ]; - # Main Xen source. src = fetchgit { url = "https://xenbits.xenproject.org/git-http/xen.git"; inherit rev hash; @@ -465,8 +462,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xl"; - #TODO: Migrate meta.platforms to the new lib.systems.inspect.patterns.* format. - platforms = linux; - badPlatforms = aarch64; + platforms = [ isLinux ]; + badPlatforms = [ isAarch64 ]; } // meta; })