Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 70de27bbb475
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd2e32a4c98d
Choose a head ref
  • 7 commits
  • 5 files changed
  • 2 contributors

Commits on Jun 8, 2019

  1. firefox-bin: 67.0 -> 67.0.1

    @andir
    andir committed Jun 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: 74908259861E8386
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d134af3 View commit details

  2. firefox-beta-bin: 67.0b19 -> 68.0b8

    @andir
    andir committed Jun 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: 74908259861E8386
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2779a3f View commit details

  3. firefox-devedition-bin: 67.0b19 -> 68.0b8

    @andir
    andir committed Jun 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: 74908259861E8386
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bb4dc7f View commit details

  4. firefox: 67.0 -> 67.0.1

    @andir
    andir committed Jun 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: 74908259861E8386
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0312883 View commit details

  5. androidStudioPackages.{dev,canary}: 3.6.0.2 -> 3.6.0.3

    @primeos
    primeos committed Jun 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a865fef View commit details

  6. androidStudioPackages.beta: 3.5.0.15 -> 3.5.0.16

    @primeos
    primeos committed Jun 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a438c4e View commit details

  7. Merge pull request #62866 from andir/firefox 

    firefox 67.0 -> 67.0.1
    @andir
    andir authored Jun 8, 2019

    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
    dd2e32a View commit details
12 changes: 6 additions & 6 deletions pkgs/applications/editors/android-studio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,14 +13,14 @@ let
sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30";
};
betaVersion = {
version = "3.5.0.15"; # "Android Studio 3.5 Beta 3"
build = "191.5585527";
sha256Hash = "0b9yj3rf3nk8y9qfmf5kjh8rwn73v7ghym1bhz864r079h7lwr53";
version = "3.5.0.16"; # "Android Studio 3.5 Beta 4"
build = "191.5619324";
sha256Hash = "1rg6v9b8fdnmslpv80khhpx59lvwhj1vwbkyabz2fryfj67wz01z";
};
latestVersion = { # canary & dev
version = "3.6.0.2"; # "Android Studio 3.6 Canary 2"
build = "191.5599242";
sha256Hash = "0aivw3lz09v7sq28ply9nczaxkwdlkb5byr8yym5qydkcv35x9gl";
version = "3.6.0.3"; # "Android Studio 3.6 Canary 3"
build = "191.5618338";
sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519";
};
in rec {
# Attributes are named by their corresponding release channels
810 changes: 375 additions & 435 deletions pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View file

Large diffs are not rendered by default.

810 changes: 375 additions & 435 deletions pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View file

Large diffs are not rendered by default.

794 changes: 397 additions & 397 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17,10 +17,10 @@ rec {

firefox = common rec {
pname = "firefox";
ffversion = "67.0";
ffversion = "67.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0lwljfcbb1avnlafyrw5z08l3wxixfk6nv91blp6sc45mvsk89l77ckfyay7jy4v6c84q4a9h0wbh2mnx0r1xm3fhy9lshlm1n0s051";
sha512 = "1cbhlbgni08phqqiqlh1c29kl8b1w2sify4756bm4a01hmhfnhgwfa6v88vhzqy9h4c0045g8g4w14l2521k8w6rcijl1nvh14xdczf";
};

patches = [