swiftpm2nix: migrate to Swift suite directory

Since they are from the same team.
NixOS · Jul 18, 2024 · 2709408 · 2709408
1 parent 7246208
commit 2709408
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git 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/...development/tools/swiftpm2nix/default.nix → ...t/compilers/swift/swiftpm2nix/default.nix b/...development/tools/swiftpm2nix/default.nix → ...t/compilers/swift/swiftpm2nix/default.nix
diff --git a/...development/tools/swiftpm2nix/support.nix → ...t/compilers/swift/swiftpm2nix/support.nix b/...development/tools/swiftpm2nix/support.nix → ...t/compilers/swift/swiftpm2nix/support.nix
diff --git a/...elopment/tools/swiftpm2nix/swiftpm2nix.sh → ...ompilers/swift/swiftpm2nix/swiftpm2nix.sh b/...elopment/tools/swiftpm2nix/swiftpm2nix.sh → ...ompilers/swift/swiftpm2nix/swiftpm2nix.sh
diff --git 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;