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

Commits on Dec 17, 2019

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

    Lily Ballard committed Dec 17, 2019
    Copy the full SHA
    d440cea View commit details

Commits on Jan 11, 2020

  1. Merge pull request #75841 from lilyball/cocoapods-beta 

    cocoapods-beta: 1.9.0.beta.1 -> 1.9.0.beta.2
    @aanderse
    aanderse authored Jan 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    526aec7 View commit details
Showing with 7 additions and 7 deletions.
  1. +3 −3 pkgs/development/mobile/cocoapods/Gemfile-beta.lock
  2. +4 −4 pkgs/development/mobile/cocoapods/gemset-beta.nix
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
@@ -12,10 +12,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.9.0.beta.1)
cocoapods (1.9.0.beta.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.0.beta.1)
cocoapods-core (= 1.9.0.beta.2)
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.14.0, < 2.0)
cocoapods-core (1.9.0.beta.1)
cocoapods-core (1.9.0.beta.2)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
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
@@ -57,21 +57,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14447zrbg90gvjhfpwmjsfh4n7i9f0p1zd0jj3m2cx4y8102djiy";
sha256 = "0lx1h0i1rly9rnzl3szr0mws9b1l6ik1k84rcfwmhppfacc8bp15";
type = "gem";
};
version = "1.9.0.beta.1";
version = "1.9.0.beta.2";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nhrqwrvblpgf4k3cy0nyxfphyzw46zql1pdv1x7y42h4cn5z8qp";
sha256 = "0h364ayikbicm6fy1faznwlnqnahqf330dnqjcb0vszqhxw0xq59";
type = "gem";
};
version = "1.9.0.beta.1";
version = "1.9.0.beta.2";
};
cocoapods-deintegrate = {
groups = ["default"];