Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8c131d69304d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8b2b0f741375
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on May 30, 2019

  1. cocoapods: 1.6.2 -> 1.7.1

    @lilyball
    lilyball committed May 30, 2019
    Copy the full SHA
    71f01b1 View commit details

  2. cocoapods-beta: 1.7.0.rc.2 -> 1.7.1

    @lilyball
    lilyball committed May 30, 2019
    Copy the full SHA
    0f9c140 View commit details

Commits on Jun 1, 2019

  1. Merge pull request #61906 from lilyball/cocoapods 

    cocoapods: 1.6.2 -> 1.7.1
    @matthewbauer
    matthewbauer authored Jun 1, 2019
    Copy the full SHA
    8b2b0f7 View commit details
6 changes: 3 additions & 3 deletions pkgs/development/mobile/cocoapods/Gemfile-beta.lock
View file
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.7.0.rc.2)
cocoapods (1.7.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.0.rc.2)
cocoapods-core (= 1.7.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,7 +28,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.2, < 2.0)
cocoapods-core (1.7.0.rc.2)
cocoapods-core (1.7.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
10 changes: 5 additions & 5 deletions pkgs/development/mobile/cocoapods/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.6.2)
cocoapods (1.7.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.2)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
@@ -27,8 +27,8 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.2)
xcodeproj (>= 1.8.2, < 2.0)
cocoapods-core (1.7.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
8 changes: 4 additions & 4 deletions pkgs/development/mobile/cocoapods/gemset-beta.nix
View file
Original file line number Diff line number Diff line change
@@ -46,21 +46,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s9kqrmlvmgyd9aqrv89lg1ccspbk9hw2qx3fpb56xff1zk69gwf";
sha256 = "0iyk28wd5k77vcsl9w5c04x5wz4a00ximwz6p2smccm7xk6v07gs";
type = "gem";
};
version = "1.7.0.rc.2";
version = "1.7.1";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x940n7ifn8fpr9siicqassryarg13sxh6nmi3cgbbdmnd1ic8b1";
sha256 = "090a57w0lrnf5f86hdmiz8snkal2f48998lin1sx84wlh3y0ng4x";
type = "gem";
};
version = "1.7.0.rc.2";
version = "1.7.1";
};
cocoapods-deintegrate = {
groups = ["default"];
8 changes: 4 additions & 4 deletions pkgs/development/mobile/cocoapods/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -40,21 +40,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f2xdcar9yk3x4v18pjh3rnn489h252wh3llxx39ig18pcijwzmg";
sha256 = "0iyk28wd5k77vcsl9w5c04x5wz4a00ximwz6p2smccm7xk6v07gs";
type = "gem";
};
version = "1.6.2";
version = "1.7.1";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "052fwscc9k3pvka6y8c2mh8i7wm6a6jk44b236krj33jyzk0z2vw";
sha256 = "090a57w0lrnf5f86hdmiz8snkal2f48998lin1sx84wlh3y0ng4x";
type = "gem";
};
version = "1.6.2";
version = "1.7.1";
};
cocoapods-deintegrate = {
groups = ["default"];