diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2024-07-17 23:33:42 -0300 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2024-07-17 23:34:17 -0300 |
| commit | 2709408a33749bb630ab56e5b5c46a5cda0bbf82 (patch) | |
| tree | 39aa99edcae856b61f0b5d831de43809eaae9466 | |
| parent | treewide: update meta.maintainers for Swift suite (diff) | |
| download | nixpkgs-2709408a33749bb630ab56e5b5c46a5cda0bbf82.tar.gz | |
swiftpm2nix: migrate to Swift suite directory
Since they are from the same team.
| -rw-r--r-- | pkgs/development/compilers/swift/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/swift/swiftpm2nix/default.nix (renamed from pkgs/development/tools/swiftpm2nix/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/compilers/swift/swiftpm2nix/support.nix (renamed from pkgs/development/tools/swiftpm2nix/support.nix) | 0 | ||||
| -rwxr-xr-x | pkgs/development/compilers/swift/swiftpm2nix/swiftpm2nix.sh (renamed from pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
5 files changed, 3 insertions, 3 deletions
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 index 26713860e198..26713860e198 100644 --- a/pkgs/development/tools/swiftpm2nix/default.nix +++ b/pkgs/development/compilers/swift/swiftpm2nix/default.nix diff --git a/pkgs/development/tools/swiftpm2nix/support.nix b/pkgs/development/compilers/swift/swiftpm2nix/support.nix index 3debda233c5f..3debda233c5f 100644 --- a/pkgs/development/tools/swiftpm2nix/support.nix +++ b/pkgs/development/compilers/swift/swiftpm2nix/support.nix diff --git a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh b/pkgs/development/compilers/swift/swiftpm2nix/swiftpm2nix.sh index eda7f475064a..eda7f475064a 100755 --- a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh +++ b/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; |