Unverified Commit 28f1c870 authored by Fernando Rodrigues's avatar Fernando Rodrigues
Browse files

xen: avoid writing upstreamPatches multiple times 



Use `with upstreamPatches;` instead.

Signed-off-by: default avatarFernando Rodrigues <alpha@sigmasquadron.net>
parent bdcf44c5

pkgs/applications/virtualization/xen/4.16/default.nix

+8 −5
Original line number Diff line number Diff line
@@ -12,11 +12,14 @@ let 
    inherit fetchpatch;

  };



  upstreamPatchList = lib.lists.flatten [

    upstreamPatches.XSA_458

    upstreamPatches.XSA_460

    upstreamPatches.XSA_461

  ];

  upstreamPatchList = lib.lists.flatten (

    with upstreamPatches;

    [

      XSA_458

      XSA_460

      XSA_461

    ]

  );

in



callPackage (import ../generic/default.nix {

pkgs/applications/virtualization/xen/4.17/default.nix

+9 −6
Original line number Diff line number Diff line
@@ -12,12 +12,15 @@ let 
    inherit fetchpatch;

  };



  upstreamPatchList = lib.lists.flatten [

    upstreamPatches.QUBES_REPRODUCIBLE_BUILDS

    upstreamPatches.XSA_458

    upstreamPatches.XSA_460

    upstreamPatches.XSA_461

  ];

  upstreamPatchList = lib.lists.flatten (

    with upstreamPatches;

    [

      QUBES_REPRODUCIBLE_BUILDS

      XSA_458

      XSA_460

      XSA_461

    ]

  );

in



callPackage (import ../generic/default.nix {

pkgs/applications/virtualization/xen/4.18/default.nix

+9 −6
Original line number Diff line number Diff line
@@ -12,12 +12,15 @@ let 
    inherit fetchpatch;

  };



  upstreamPatchList = lib.lists.flatten [

    upstreamPatches.QUBES_REPRODUCIBLE_BUILDS

    upstreamPatches.XSA_458

    upstreamPatches.XSA_460

    upstreamPatches.XSA_461

  ];

  upstreamPatchList = lib.lists.flatten (

    with upstreamPatches;

    [

      QUBES_REPRODUCIBLE_BUILDS

      XSA_458

      XSA_460

      XSA_461

    ]

  );

in



callPackage (import ../generic/default.nix {

pkgs/applications/virtualization/xen/4.19/default.nix

+8 −5
Original line number Diff line number Diff line
@@ -12,11 +12,14 @@ let 
    inherit fetchpatch;

  };



  upstreamPatchList = lib.lists.flatten [

    upstreamPatches.QUBES_REPRODUCIBLE_BUILDS

    upstreamPatches.XSA_460

    upstreamPatches.XSA_461

  ];

  upstreamPatchList = lib.lists.flatten (

    with upstreamPatches;

    [

      QUBES_REPRODUCIBLE_BUILDS

      XSA_460

      XSA_461

    ]

  );

in



callPackage (import ../generic/default.nix {

pkgs/applications/virtualization/xen/update.sh

+4 −5
Original line number Diff line number Diff line
@@ -120,11 +120,10 @@ for version in "${supportedVersions[@]}"; do 
    echo -e "Found the following patches:\n  \e[1;32mXen\e[0m:     \e[1;33m$discoveredXenPatchesEcho\e[0m\n  \e[1;36mQEMU\e[0m:    \e[1;33m$discoveredQEMUPatchesEcho\e[0m\n  \e[1;36mSeaBIOS\e[0m: \e[1;33m$discoveredSeaBIOSPatchesEcho\e[0m\n  \e[1;36mOVMF\e[0m:    \e[1;33m$discoveredOVMFPatchesEcho\e[0m\n  \e[1;36miPXE\e[0m:    \e[1;33m$discoveredIPXEPatchesEcho\e[0m"



    # Prepare patches that are called in ./patches.nix.

    defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_458")

    defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_458" "XSA_460" "XSA_461" )

    read -r -a defaultPatchList -p $'\nWould you like to override the \e[1;34mupstreamPatches\e[0m list for \e[1;32mXen '"$version"$'\e[0m? If no, press \e[1;34menter\e[0m to use the default patch list: [ \e[1;34m'"${defaultPatchListInit[*]}"$' \e[0m]: '

    defaultPatchList=(${defaultPatchList[@]:-${defaultPatchListInit[@]}})

    spaceSeparatedPatchList=${defaultPatchList[*]}

    upstreamPatches="upstreamPatches.${spaceSeparatedPatchList// / upstreamPatches.}"

    upstreamPatches=${defaultPatchList[*]}



    # Write and format default.nix file.

    echo -e "\nWriting updated \e[1;34mversionDefinition\e[0m..."
@@ -143,9 +142,9 @@ let 
    inherit fetchpatch;

  };



  upstreamPatchList = lib.lists.flatten [

  upstreamPatchList = lib.lists.flatten (with upstreamPatches; [

    $upstreamPatches

  ];

  ]);

in



callPackage (import ../generic/default.nix {