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: 85f3d86bea70
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f2ecbaa6cfe3
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Oct 19, 2019

  1. cocoapods: 1.8.1 -> 1.8.4

    @lilyball
    lilyball committed Oct 19, 2019
    Copy the full SHA
    cfb0c10 View commit details

  2. cocoapods-beta: 1.8.1 -> 1.8.4

    @lilyball
    lilyball committed Oct 19, 2019
    Copy the full SHA
    8c15284 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70417 from lilyball/cocoapods 

    cocoapods: 1.8.1 -> 1.8.4
    @marsam
    marsam authored Nov 7, 2019
    Copy the full SHA
    f2ecbaa View commit details
10 changes: 5 additions & 5 deletions pkgs/development/mobile/cocoapods/Gemfile-beta.lock
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.8.1)
cocoapods (1.8.4)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.8.1)
cocoapods-core (= 1.8.4)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.1)
cocoapods-core (1.8.4)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
@@ -57,7 +57,7 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.2.0)
minitest (5.12.0)
minitest (5.12.2)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
@@ -66,7 +66,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.12.0)
xcodeproj (1.13.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.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
@@ -12,10 +12,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.8.1)
cocoapods (1.8.4)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.8.1)
cocoapods-core (= 1.8.4)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.1)
cocoapods-core (1.8.4)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
@@ -57,7 +57,7 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.2.0)
minitest (5.12.0)
minitest (5.12.2)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
@@ -66,7 +66,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.12.0)
xcodeproj (1.13.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
16 changes: 8 additions & 8 deletions pkgs/development/mobile/cocoapods/gemset-beta.nix
View file
Original file line number Diff line number Diff line change
@@ -57,21 +57,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "108zj698l44wnc0jgx81gxra86c7mrzyqrx6rxssalrc5rviadw7";
sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc";
type = "gem";
};
version = "1.8.1";
version = "1.8.4";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15bcc7771jws4p3n3sd26faxslah0yvqgpb0y8gh6d0dwjdygmk0";
sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad";
type = "gem";
};
version = "1.8.1";
version = "1.8.4";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -241,10 +241,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kj5m8gg643w8jh8nsdy15bpddmnnafhyzhjx7gp28l1acb4fik7";
sha256 = "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw";
type = "gem";
};
version = "5.12.0";
version = "5.12.2";
};
molinillo = {
groups = ["default"];
@@ -323,9 +323,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8";
sha256 = "1c69yrhqd92q6nnpyhvnqyw9l7axnc91gnbd2gai8f5njdisd8wx";
type = "gem";
};
version = "1.12.0";
version = "1.13.0";
};
}
16 changes: 8 additions & 8 deletions pkgs/development/mobile/cocoapods/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -55,21 +55,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "108zj698l44wnc0jgx81gxra86c7mrzyqrx6rxssalrc5rviadw7";
sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc";
type = "gem";
};
version = "1.8.1";
version = "1.8.4";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15bcc7771jws4p3n3sd26faxslah0yvqgpb0y8gh6d0dwjdygmk0";
sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad";
type = "gem";
};
version = "1.8.1";
version = "1.8.4";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -223,10 +223,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kj5m8gg643w8jh8nsdy15bpddmnnafhyzhjx7gp28l1acb4fik7";
sha256 = "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw";
type = "gem";
};
version = "5.12.0";
version = "5.12.2";
};
molinillo = {
source = {
@@ -293,9 +293,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8";
sha256 = "1c69yrhqd92q6nnpyhvnqyw9l7axnc91gnbd2gai8f5njdisd8wx";
type = "gem";
};
version = "1.12.0";
version = "1.13.0";
};
}