From a52df9cf48d0d2f61e2ea7819c634a2123e8b64f Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 11 Aug 2024 16:25:58 +0000
Subject: [PATCH] xen: move generic files to generic/ directory

Most patches used in the Xen build are generic, so let's keep everything
that applies to all versions in one folder.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/applications/virtualization/xen/4.16/default.nix       | 4 ++--
 pkgs/applications/virtualization/xen/4.17/default.nix       | 4 ++--
 pkgs/applications/virtualization/xen/4.18/default.nix       | 4 ++--
 pkgs/applications/virtualization/xen/4.19/default.nix       | 4 ++--
 pkgs/applications/virtualization/xen/README.md              | 2 +-
 .../virtualization/xen/{generic.nix => generic/default.nix} | 4 ++--
 .../virtualization/xen/{ => generic}/patches.nix            | 0
 pkgs/applications/virtualization/xen/update.sh              | 6 +++---
 8 files changed, 14 insertions(+), 14 deletions(-)
 rename pkgs/applications/virtualization/xen/{generic.nix => generic/default.nix} (98%)
 rename pkgs/applications/virtualization/xen/{ => generic}/patches.nix (100%)

diff --git a/pkgs/applications/virtualization/xen/4.16/default.nix b/pkgs/applications/virtualization/xen/4.16/default.nix
index e67b2b052a6e..88b4946ef712 100644
--- a/pkgs/applications/virtualization/xen/4.16/default.nix
+++ b/pkgs/applications/virtualization/xen/4.16/default.nix
@@ -7,7 +7,7 @@
 }@genericDefinition:
 
 let
-  upstreamPatches = import ../patches.nix {
+  upstreamPatches = import ../generic/patches.nix {
     inherit lib;
     inherit fetchpatch;
   };
@@ -19,7 +19,7 @@ let
   ];
 in
 
-callPackage (import ../generic.nix {
+callPackage (import ../generic/default.nix {
   branch = "4.16";
   version = "4.16.6";
   latest = false;
diff --git a/pkgs/applications/virtualization/xen/4.17/default.nix b/pkgs/applications/virtualization/xen/4.17/default.nix
index a179ac94d9c2..31b12685271c 100644
--- a/pkgs/applications/virtualization/xen/4.17/default.nix
+++ b/pkgs/applications/virtualization/xen/4.17/default.nix
@@ -7,7 +7,7 @@
 }@genericDefinition:
 
 let
-  upstreamPatches = import ../patches.nix {
+  upstreamPatches = import ../generic/patches.nix {
     inherit lib;
     inherit fetchpatch;
   };
@@ -20,7 +20,7 @@ let
   ];
 in
 
-callPackage (import ../generic.nix {
+callPackage (import ../generic/default.nix {
   branch = "4.17";
   version = "4.17.4";
   latest = false;
diff --git a/pkgs/applications/virtualization/xen/4.18/default.nix b/pkgs/applications/virtualization/xen/4.18/default.nix
index 292d55058e7b..0494a2d054e0 100644
--- a/pkgs/applications/virtualization/xen/4.18/default.nix
+++ b/pkgs/applications/virtualization/xen/4.18/default.nix
@@ -7,7 +7,7 @@
 }@genericDefinition:
 
 let
-  upstreamPatches = import ../patches.nix {
+  upstreamPatches = import ../generic/patches.nix {
     inherit lib;
     inherit fetchpatch;
   };
@@ -20,7 +20,7 @@ let
   ];
 in
 
-callPackage (import ../generic.nix {
+callPackage (import ../generic/default.nix {
   branch = "4.18";
   version = "4.18.2";
   latest = false;
diff --git a/pkgs/applications/virtualization/xen/4.19/default.nix b/pkgs/applications/virtualization/xen/4.19/default.nix
index 278c40121433..469302f14b2b 100644
--- a/pkgs/applications/virtualization/xen/4.19/default.nix
+++ b/pkgs/applications/virtualization/xen/4.19/default.nix
@@ -7,7 +7,7 @@
 }@genericDefinition:
 
 let
-  upstreamPatches = import ../patches.nix {
+  upstreamPatches = import ../generic/patches.nix {
     inherit lib;
     inherit fetchpatch;
   };
@@ -19,7 +19,7 @@ let
   ];
 in
 
-callPackage (import ../generic.nix {
+callPackage (import ../generic/default.nix {
   branch = "4.19";
   version = "4.19.0";
   latest = true;
diff --git a/pkgs/applications/virtualization/xen/README.md b/pkgs/applications/virtualization/xen/README.md
index c059808dcecb..5f16607b25cb 100644
--- a/pkgs/applications/virtualization/xen/README.md
+++ b/pkgs/applications/virtualization/xen/README.md
@@ -118,7 +118,7 @@ are requested by the main Xen build.
 Building `xen.efi` requires an `ld` with PE support.[^2]
 
 We use a `makeFlag` to override the `$LD` environment variable to point to our
-patched `efiBinutils`. For more information, see the comment in `./generic.nix`.
+patched `efiBinutils`. For more information, see the comment in `./generic/default.nix`.
 
 > [!TIP]
 > If you are certain you will not be running Xen in an x86 EFI environment, disable
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic/default.nix
similarity index 98%
rename from pkgs/applications/virtualization/xen/generic.nix
rename to pkgs/applications/virtualization/xen/generic/default.nix
index b8672770e5bd..591d4ab945e4 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic/default.nix
@@ -175,7 +175,7 @@ let
       if builtins.isPath patch then
         { type = "path"; }
       else
-        throw "xen/generic.nix: normalisedPatchList attempted to normalise something that is not a Path or an Attribute Set."
+        throw "xen/generic/default.nix: normalisedPatchList attempted to normalise something that is not a Path or an Attribute Set."
     else
       patch
   ) pkg.xen.patches;
@@ -632,7 +632,7 @@ stdenv.mkDerivation (finalAttrs: {
       # Starts with the longDescription from ./packages.nix.
       (packageDefinition.meta.longDescription or "")
       + lib.strings.optionalString (!withInternalQEMU) (
-        "\nUse with `qemu_xen_${lib.stringAsChars (x: if x == "." then "_" else x) branch}`"
+        "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`"
         + lib.strings.optionalString latest " or `qemu_xen`"
         + ".\n"
       )
diff --git a/pkgs/applications/virtualization/xen/patches.nix b/pkgs/applications/virtualization/xen/generic/patches.nix
similarity index 100%
rename from pkgs/applications/virtualization/xen/patches.nix
rename to pkgs/applications/virtualization/xen/generic/patches.nix
diff --git a/pkgs/applications/virtualization/xen/update.sh b/pkgs/applications/virtualization/xen/update.sh
index 0b0c7516fa83..f5034d11c0af 100755
--- a/pkgs/applications/virtualization/xen/update.sh
+++ b/pkgs/applications/virtualization/xen/update.sh
@@ -32,7 +32,7 @@ latestVersion=$(echo "$versionList" | tr ' ' '\n' | tail --lines=1)
 branchList=($(echo "$versionList" | tr ' ' '\n' | sed s/\.[0-9]*$//g | awk '!seen[$0]++'))
 
 # Figure out which versions we're actually going to install.
-minSupportedBranch="$(grep "    knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version " "$xenPath"/generic.nix | sed s/'    knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version "'//g | sed s/'") \['//g)"
+minSupportedBranch="$(grep "    knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version " "$xenPath"/generic/default.nix | sed s/'    knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version "'//g | sed s/'") \['//g)"
 supportedBranches=($(for version in "${branchList[@]}"; do if [ "$(printf '%s\n' "$minSupportedBranch" "$version" | sort -V | head -n1)" = "$minSupportedBranch" ]; then echo "$version"; fi; done))
 supportedVersions=($(for version in "${supportedBranches[@]}"; do echo "$versionList" | tr ' ' '\n' | grep "$version" | tail --lines=1; done))
 
@@ -139,7 +139,7 @@ for version in "${supportedVersions[@]}"; do
 }@genericDefinition:
 
 let
-  upstreamPatches = import ../patches.nix {
+  upstreamPatches = import ../generic/patches.nix {
     inherit lib;
     inherit fetchpatch;
   };
@@ -149,7 +149,7 @@ let
   ];
 in
 
-callPackage (import ../generic.nix {
+callPackage (import ../generic/default.nix {
   branch = "$branch";
   version = "$version";
   latest = $latest;