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

Commits on Aug 12, 2020

  1. cocoapods-beta: 1.10.0.beta.1 -> 1.10.0.beta.2

    @lilyball
    lilyball committed Aug 12, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    meyfa Fabian Meyer
    GPG key ID: 8238F1A166D59533
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b02225d View commit details

Commits on Aug 13, 2020

  1. Merge pull request #95277 from lilyball/cocoapods 

    cocoapods-beta: 1.10.0.beta.1 -> 1.10.0.beta.2
    @marsam
    marsam authored Aug 13, 2020
    Copy the full SHA
    9a1aa2a View commit details
Showing with 14 additions and 15 deletions.
  1. +5 −6 pkgs/development/mobile/cocoapods/Gemfile-beta.lock
  2. +9 −9 pkgs/development/mobile/cocoapods/gemset-beta.nix
11 changes: 5 additions & 6 deletions pkgs/development/mobile/cocoapods/Gemfile-beta.lock
View file
Original file line number Diff line number Diff line change
@@ -14,11 +14,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.10.0.beta.1)
activesupport (> 5)
cocoapods (1.10.0.beta.2)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.0.beta.1)
cocoapods-core (= 1.10.0.beta.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -33,7 +32,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.17.0, < 2.0)
cocoapods-core (1.10.0.beta.1)
cocoapods-core (1.10.0.beta.2)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
@@ -53,7 +52,7 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.7)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
@@ -77,7 +76,7 @@ GEM
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.17.1)
xcodeproj (1.18.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
18 changes: 9 additions & 9 deletions pkgs/development/mobile/cocoapods/gemset-beta.nix
View file
Original file line number Diff line number Diff line change
@@ -63,26 +63,26 @@
version = "1.0.3";
};
cocoapods = {
dependencies = ["activesupport" "addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mx6gzs1d9za7crgwmk37ybmn395055kzya88iamgcj3yzvv3sqg";
sha256 = "0jf5q75h410b6gymy86j4zy9yhb6n28wa7hrk8p7y2dsafdzbric";
type = "gem";
};
version = "1.10.0.beta.1";
version = "1.10.0.beta.2";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ibc5sx2iqjwrgmd4y2cq6hyd6s37aqyh2w61vw71ap8khcjnwh4";
sha256 = "0vrw6v5fp0m903ghvfwaw3mbxrr68x7hz9bj34rj4icirwp4ifyl";
type = "gem";
};
version = "1.10.0.beta.1";
version = "1.10.0.beta.2";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -161,10 +161,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
type = "gem";
};
version = "1.1.6";
version = "1.1.7";
};
escape = {
groups = ["default"];
@@ -366,9 +366,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mv5rsbgwq4vzri31w2f1474arrsr5j69rdhklrci6jnjps8dmx9";
sha256 = "18idiqfbvyrcyflccwy4qw125psckrnqy7ggci33m8f3zs8h7hnm";
type = "gem";
};
version = "1.17.1";
version = "1.18.0";
};
}