From 2709408a33749bb630ab56e5b5c46a5cda0bbf82 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 17 Jul 2024 23:33:42 -0300
Subject: [PATCH] swiftpm2nix: migrate to Swift suite directory

Since they are from the same team.
---
 pkgs/development/compilers/swift/default.nix                  | 2 ++
 .../{tools => compilers/swift}/swiftpm2nix/default.nix        | 0
 .../{tools => compilers/swift}/swiftpm2nix/support.nix        | 0
 .../{tools => compilers/swift}/swiftpm2nix/swiftpm2nix.sh     | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/{tools => compilers/swift}/swiftpm2nix/default.nix (100%)
 rename pkgs/development/{tools => compilers/swift}/swiftpm2nix/support.nix (100%)
 rename pkgs/development/{tools => compilers/swift}/swiftpm2nix/swiftpm2nix.sh (100%)

diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 2a56a03766b9..fede34c8b0c2 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -108,6 +108,8 @@ let
 
     swift-format = callPackage ./swift-format { };
 
+    swiftpm2nix = callPackage ./swiftpm2nix { };
+
   };
 
 in self
diff --git a/pkgs/development/tools/swiftpm2nix/default.nix b/pkgs/development/compilers/swift/swiftpm2nix/default.nix
similarity index 100%
rename from pkgs/development/tools/swiftpm2nix/default.nix
rename to pkgs/development/compilers/swift/swiftpm2nix/default.nix
diff --git a/pkgs/development/tools/swiftpm2nix/support.nix b/pkgs/development/compilers/swift/swiftpm2nix/support.nix
similarity index 100%
rename from pkgs/development/tools/swiftpm2nix/support.nix
rename to pkgs/development/compilers/swift/swiftpm2nix/support.nix
diff --git a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh b/pkgs/development/compilers/swift/swiftpm2nix/swiftpm2nix.sh
similarity index 100%
rename from pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh
rename to pkgs/development/compilers/swift/swiftpm2nix/swiftpm2nix.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d503b2b695ec..933d8980c83e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16654,9 +16654,7 @@ with pkgs;
   svdtools = callPackage ../development/embedded/svdtools { };
 
   swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { });
-  inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format;
-
-  swiftpm2nix = callPackage ../development/tools/swiftpm2nix { };
+  inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format swiftpm2nix;
 
   swiProlog = callPackage ../development/compilers/swi-prolog {
     inherit (darwin.apple_sdk.frameworks) Security;