From c9f7d60011d69933fa103cf4bbdbc9c9bd05bd5a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 12:09:17 -0300 Subject: [PATCH 1/6] treewide: remove dtzWill as maintainer [no orphans] Since theey is not active in a long span of time. None of the packages in this commit are orphan. All the packages listed here are related to Swift programming language compiler suite. --- pkgs/development/compilers/swift/compiler/default.nix | 2 +- pkgs/development/compilers/swift/foundation/default.nix | 2 +- pkgs/development/compilers/swift/libdispatch/default.nix | 2 +- pkgs/development/compilers/swift/sourcekit-lsp/default.nix | 2 +- pkgs/development/compilers/swift/swift-docc/default.nix | 2 +- pkgs/development/compilers/swift/swift-driver/default.nix | 2 +- pkgs/development/compilers/swift/swift-format/default.nix | 2 +- pkgs/development/compilers/swift/swiftpm/default.nix | 2 +- pkgs/development/compilers/swift/xctest/default.nix | 2 +- pkgs/development/tools/swiftpm2nix/default.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index c00b93ac48f5e..ffd1b27f14c58 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -702,7 +702,7 @@ in stdenv.mkDerivation { meta = { description = "Swift Programming Language"; homepage = "https://github.com/apple/swift"; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; license = lib.licenses.asl20; platforms = with lib.platforms; linux ++ darwin; # Swift doesn't support 32-bit Linux, unknown on other platforms. diff --git a/pkgs/development/compilers/swift/foundation/default.nix b/pkgs/development/compilers/swift/foundation/default.nix index eab509c5aaa1e..99e6553d48b3c 100644 --- a/pkgs/development/compilers/swift/foundation/default.nix +++ b/pkgs/development/compilers/swift/foundation/default.nix @@ -67,6 +67,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-foundation"; platforms = lib.platforms.linux; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; }; } diff --git a/pkgs/development/compilers/swift/libdispatch/default.nix b/pkgs/development/compilers/swift/libdispatch/default.nix index 4a0616ded5ac5..92c30cf705022 100644 --- a/pkgs/development/compilers/swift/libdispatch/default.nix +++ b/pkgs/development/compilers/swift/libdispatch/default.nix @@ -37,6 +37,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-libdispatch"; platforms = lib.platforms.linux; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cmm dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ cmm trepetti dduan trundle stephank ]; }; } diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index ec05eea01bf4d..be8fd39a52894 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/sourcekit-lsp"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; }; } diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index 5dec14eb475dc..3ee6e461fab2f 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-docc"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; }; } diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index 3245fa1d8787f..74ebdd5920f04 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-driver"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; }; } diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix index a3d939b85cbd8..624c45d745c56 100644 --- a/pkgs/development/compilers/swift/swift-format/default.nix +++ b/pkgs/development/compilers/swift/swift-format/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-format"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; mainProgram = "swift-format"; }; } diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index ff4f5f1e1b10c..bc45fa86dd63e 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -459,6 +459,6 @@ in stdenv.mkDerivation (commonAttrs // { homepage = "https://github.com/apple/swift-package-manager"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; }; }) diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix index c8003d8486f10..6cd956b1d2c21 100644 --- a/pkgs/development/compilers/swift/xctest/default.nix +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-xctest"; platforms = lib.platforms.all; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; }; } diff --git a/pkgs/development/tools/swiftpm2nix/default.nix b/pkgs/development/tools/swiftpm2nix/default.nix index d9f50cb801d56..559671d3431e1 100644 --- a/pkgs/development/tools/swiftpm2nix/default.nix +++ b/pkgs/development/tools/swiftpm2nix/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Generate a Nix expression to fetch swiftpm dependencies"; mainProgram = "swiftpm2nix"; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; platforms = lib.platforms.all; }; } From bbc25fdf936845051cad9dc9a3ef418011d76e91 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 12:20:22 -0300 Subject: [PATCH 2/6] teams: create a team for Swift language --- maintainers/team-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index bc154625997e3..a645038be7b10 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -951,6 +951,12 @@ with lib.maintainers; shortName = "StridTech"; }; + swift = { + members = [ ]; + scope = "Maintain Swift compiler suite for NixOS."; + shortName = "Swift"; + }; + systemd = { members = [ ]; githubTeams = [ "systemd" ]; From 6f094d16cbf448820bd6ac52a62b11d752b45e55 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 12:28:29 -0300 Subject: [PATCH 3/6] teams: populate swift.members --- maintainers/team-list.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a645038be7b10..5497412aa2b67 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -952,7 +952,12 @@ with lib.maintainers; }; swift = { - members = [ ]; + members = [ + dduan + stephank + trepetti + trundle + ]; scope = "Maintain Swift compiler suite for NixOS."; shortName = "Swift"; }; From 2a9a026118eaddbdb027d25158862806bb69cfbd Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 12:26:47 -0300 Subject: [PATCH 4/6] treewide: add lib.teams.swift.members to Swift suite --- pkgs/development/compilers/swift/compiler/default.nix | 2 +- pkgs/development/compilers/swift/foundation/default.nix | 2 +- pkgs/development/compilers/swift/libdispatch/default.nix | 2 +- pkgs/development/compilers/swift/sourcekit-lsp/default.nix | 2 +- pkgs/development/compilers/swift/swift-docc/default.nix | 2 +- pkgs/development/compilers/swift/swift-driver/default.nix | 2 +- pkgs/development/compilers/swift/swift-format/default.nix | 2 +- pkgs/development/compilers/swift/swiftpm/default.nix | 2 +- pkgs/development/compilers/swift/xctest/default.nix | 2 +- pkgs/development/tools/swiftpm2nix/default.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index ffd1b27f14c58..3923a6dfcf241 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -702,7 +702,7 @@ in stdenv.mkDerivation { meta = { description = "Swift Programming Language"; homepage = "https://github.com/apple/swift"; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); license = lib.licenses.asl20; platforms = with lib.platforms; linux ++ darwin; # Swift doesn't support 32-bit Linux, unknown on other platforms. diff --git a/pkgs/development/compilers/swift/foundation/default.nix b/pkgs/development/compilers/swift/foundation/default.nix index 99e6553d48b3c..b7d85feaf6a7d 100644 --- a/pkgs/development/compilers/swift/foundation/default.nix +++ b/pkgs/development/compilers/swift/foundation/default.nix @@ -67,6 +67,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-foundation"; platforms = lib.platforms.linux; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); }; } diff --git a/pkgs/development/compilers/swift/libdispatch/default.nix b/pkgs/development/compilers/swift/libdispatch/default.nix index 92c30cf705022..fdffac4f4680c 100644 --- a/pkgs/development/compilers/swift/libdispatch/default.nix +++ b/pkgs/development/compilers/swift/libdispatch/default.nix @@ -37,6 +37,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-libdispatch"; platforms = lib.platforms.linux; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cmm trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ cmm trepetti dduan trundle stephank ]); }; } diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index be8fd39a52894..28692fb25cc1e 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/sourcekit-lsp"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); }; } diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index 3ee6e461fab2f..96f97deb35141 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-docc"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); }; } diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index 74ebdd5920f04..d9fb4c195af50 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-driver"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); }; } diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix index 624c45d745c56..d7fe78ac1c0c4 100644 --- a/pkgs/development/compilers/swift/swift-format/default.nix +++ b/pkgs/development/compilers/swift/swift-format/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-format"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); mainProgram = "swift-format"; }; } diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index bc45fa86dd63e..935c043190e80 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -459,6 +459,6 @@ in stdenv.mkDerivation (commonAttrs // { homepage = "https://github.com/apple/swift-package-manager"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); }; }) diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix index 6cd956b1d2c21..95fa0534a6c26 100644 --- a/pkgs/development/compilers/swift/xctest/default.nix +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-xctest"; platforms = lib.platforms.all; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with liby.maintainers; [ trepetti dduan trundle stephank ]); }; } diff --git a/pkgs/development/tools/swiftpm2nix/default.nix b/pkgs/development/tools/swiftpm2nix/default.nix index 559671d3431e1..5ffd3e554ec8b 100644 --- a/pkgs/development/tools/swiftpm2nix/default.nix +++ b/pkgs/development/tools/swiftpm2nix/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Generate a Nix expression to fetch swiftpm dependencies"; mainProgram = "swiftpm2nix"; - maintainers = with lib.maintainers; [ trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); platforms = lib.platforms.all; }; } From 7246208bc794c778ab88940338f7c09b415ddc03 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 13:13:06 -0300 Subject: [PATCH 5/6] treewide: update meta.maintainers for Swift suite --- pkgs/development/compilers/swift/compiler/default.nix | 2 +- pkgs/development/compilers/swift/foundation/default.nix | 2 +- pkgs/development/compilers/swift/libdispatch/default.nix | 2 +- pkgs/development/compilers/swift/sourcekit-lsp/default.nix | 2 +- pkgs/development/compilers/swift/swift-docc/default.nix | 2 +- pkgs/development/compilers/swift/swift-driver/default.nix | 2 +- pkgs/development/compilers/swift/swift-format/default.nix | 2 +- pkgs/development/compilers/swift/swiftpm/default.nix | 2 +- pkgs/development/compilers/swift/xctest/default.nix | 2 +- pkgs/development/tools/swiftpm2nix/default.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 3923a6dfcf241..2b2f636feef64 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -702,7 +702,7 @@ in stdenv.mkDerivation { meta = { description = "Swift Programming Language"; homepage = "https://github.com/apple/swift"; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; license = lib.licenses.asl20; platforms = with lib.platforms; linux ++ darwin; # Swift doesn't support 32-bit Linux, unknown on other platforms. diff --git a/pkgs/development/compilers/swift/foundation/default.nix b/pkgs/development/compilers/swift/foundation/default.nix index b7d85feaf6a7d..98eff7a31783a 100644 --- a/pkgs/development/compilers/swift/foundation/default.nix +++ b/pkgs/development/compilers/swift/foundation/default.nix @@ -67,6 +67,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-foundation"; platforms = lib.platforms.linux; license = lib.licenses.asl20; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/swift/libdispatch/default.nix b/pkgs/development/compilers/swift/libdispatch/default.nix index fdffac4f4680c..8478d58494831 100644 --- a/pkgs/development/compilers/swift/libdispatch/default.nix +++ b/pkgs/development/compilers/swift/libdispatch/default.nix @@ -37,6 +37,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-libdispatch"; platforms = lib.platforms.linux; license = lib.licenses.asl20; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ cmm trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ cmm ]); }; } diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index 28692fb25cc1e..f0c08a41e43e3 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/sourcekit-lsp"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index 96f97deb35141..2645f07aa4ec8 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-docc"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index d9fb4c195af50..ca2b88046c86e 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-driver"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix index d7fe78ac1c0c4..3ce4c22b69700 100644 --- a/pkgs/development/compilers/swift/swift-format/default.nix +++ b/pkgs/development/compilers/swift/swift-format/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-format"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; mainProgram = "swift-format"; }; } diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 935c043190e80..712bc01777a5e 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -459,6 +459,6 @@ in stdenv.mkDerivation (commonAttrs // { homepage = "https://github.com/apple/swift-package-manager"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; }; }) diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix index 95fa0534a6c26..d50d11706cbd3 100644 --- a/pkgs/development/compilers/swift/xctest/default.nix +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-xctest"; platforms = lib.platforms.all; license = lib.licenses.asl20; - maintainers = lib.teams.swift.members ++ (with liby.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/tools/swiftpm2nix/default.nix b/pkgs/development/tools/swiftpm2nix/default.nix index 5ffd3e554ec8b..26713860e1989 100644 --- a/pkgs/development/tools/swiftpm2nix/default.nix +++ b/pkgs/development/tools/swiftpm2nix/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Generate a Nix expression to fetch swiftpm dependencies"; mainProgram = "swiftpm2nix"; - maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ trepetti dduan trundle stephank ]); + maintainers = lib.teams.swift.members; platforms = lib.platforms.all; }; } From 2709408a33749bb630ab56e5b5c46a5cda0bbf82 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 23:33:42 -0300 Subject: [PATCH 6/6] 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 2a56a03766b95..fede34c8b0c28 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 d503b2b695ece..933d8980c83e7 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;