From 6f9296d1b6b7da4b88b848ef36e1bccf3a615300 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 18:33:28 -0700 Subject: [PATCH 1/2] cocoapods: move to more appropriate directory --- pkgs/development/{mobile => tools}/cocoapods/Gemfile | 0 pkgs/development/{mobile => tools}/cocoapods/Gemfile-beta | 0 .../development/{mobile => tools}/cocoapods/Gemfile-beta.lock | 0 pkgs/development/{mobile => tools}/cocoapods/Gemfile.lock | 0 pkgs/development/{mobile => tools}/cocoapods/default.nix | 0 pkgs/development/{mobile => tools}/cocoapods/gemset-beta.nix | 0 pkgs/development/{mobile => tools}/cocoapods/gemset.nix | 0 pkgs/development/{mobile => tools}/cocoapods/update | 0 pkgs/top-level/all-packages.nix | 4 ++-- 9 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/{mobile => tools}/cocoapods/Gemfile (100%) rename pkgs/development/{mobile => tools}/cocoapods/Gemfile-beta (100%) rename pkgs/development/{mobile => tools}/cocoapods/Gemfile-beta.lock (100%) rename pkgs/development/{mobile => tools}/cocoapods/Gemfile.lock (100%) rename pkgs/development/{mobile => tools}/cocoapods/default.nix (100%) rename pkgs/development/{mobile => tools}/cocoapods/gemset-beta.nix (100%) rename pkgs/development/{mobile => tools}/cocoapods/gemset.nix (100%) rename pkgs/development/{mobile => tools}/cocoapods/update (100%) diff --git a/pkgs/development/mobile/cocoapods/Gemfile b/pkgs/development/tools/cocoapods/Gemfile similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile rename to pkgs/development/tools/cocoapods/Gemfile diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta b/pkgs/development/tools/cocoapods/Gemfile-beta similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile-beta rename to pkgs/development/tools/cocoapods/Gemfile-beta diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile-beta.lock rename to pkgs/development/tools/cocoapods/Gemfile-beta.lock diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile.lock rename to pkgs/development/tools/cocoapods/Gemfile.lock diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/tools/cocoapods/default.nix similarity index 100% rename from pkgs/development/mobile/cocoapods/default.nix rename to pkgs/development/tools/cocoapods/default.nix diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix similarity index 100% rename from pkgs/development/mobile/cocoapods/gemset-beta.nix rename to pkgs/development/tools/cocoapods/gemset-beta.nix diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix similarity index 100% rename from pkgs/development/mobile/cocoapods/gemset.nix rename to pkgs/development/tools/cocoapods/gemset.nix diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/tools/cocoapods/update similarity index 100% rename from pkgs/development/mobile/cocoapods/update rename to pkgs/development/tools/cocoapods/update diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa2d5eb471a..aba4266c4eef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4556,9 +4556,9 @@ with pkgs; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - cocoapods = callPackage ../development/mobile/cocoapods { }; + cocoapods = callPackage ../development/tools/cocoapods { }; - cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; }); + cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; }); cocom = callPackage ../tools/networking/cocom { inherit (darwin.apple_sdk.frameworks) Security; From a48d78cb66d86458efe2b34fa94a02345d9b7c12 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 18:36:40 -0700 Subject: [PATCH 2/2] cocoapods: add meta.mainProgram --- pkgs/development/tools/cocoapods/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/cocoapods/default.nix b/pkgs/development/tools/cocoapods/default.nix index 8559ff5c74ca..54411fc01586 100644 --- a/pkgs/development/tools/cocoapods/default.nix +++ b/pkgs/development/tools/cocoapods/default.nix @@ -21,5 +21,6 @@ bundlerApp { peterromfeldhk lilyball ]; + mainProgram = "pod"; }; }