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: 482765bdc2e6
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: 7095449a5724
Choose a head ref
  • 6 commits
  • 5 files changed
  • 4 contributors

Commits on Apr 21, 2019

  1. ghcjs-ng: unbreak 

    (cherry picked from commit e4975aa)
    @vaibhavsagar @basvandijk
    vaibhavsagar authored and basvandijk committed Apr 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    734211d View commit details

Commits on May 8, 2019

  1. firefox-beta-bin: 67.0b7 -> 670b18 

    (cherry picked from commit c771c1dcc2bafc6854f68036581d30227c364d9c)
    @andir
    andir committed May 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    516bfe4 View commit details

  2. firefox-bin: 66.0.4 -> 66.0.5 

    Signed-off-by: Andreas Rammhold <andreas@rammhold.de>
    @andir
    andir committed May 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d0fdae6 View commit details

  3. firefox: 66.0.4 -> 66.0.5 

    (cherry picked from commit 67201d0de6e4bd695330ba0e0602be1eca83d5ec)
    @andir
    andir committed May 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ba383c7 View commit details

  4. Merge pull request #61132 from andir/19.03/firefox 

    [19.03] firefox: 66.0.4 -> 66.0.5, firefox-bin: 66.0.4 -> 66.0.5, firefox-beta-bin: 67.0b7 -> 670b18
    @edolstra
    edolstra authored May 8, 2019
    Copy the full SHA
    16ecfeb View commit details

  5. Merge pull request #59567 from LumiGuide/release-19.03-unbreak-ghcjs 

    ghcjs-ng: unbreak - Backport from master
    @basvandijk
    basvandijk authored May 8, 2019
    Copy the full SHA
    7095449 View commit details
794 changes: 397 additions & 397 deletions pkgs/applications/networking/browsers/firefox-bin/beta_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
@@ -10,10 +10,10 @@ rec {

firefox = common rec {
pname = "firefox";
ffversion = "66.0.4";
ffversion = "66.0.5";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0mz2xrznma3hwb2b36hlv4qmnzbfcfhrxbxqhc8yyqxnc0fm4vxbbzh1pzvghp4182n98l1dignw95v11pfgi3gss7sz1zkiywz47sw";
sha512 = "18bcpbwzhc2fi6cqhxhh6jiw5akhzr7qqs6s8irjbvh7q8f3z2n046vrlvpblhbkc2kv1n0s14n49yzv432adqwa9qi8d57jnxyfqkf";
};

patches = [
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghcjs-ng/common-overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -5,4 +5,5 @@ in self: super: {
ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
system-fileio = doJailbreak super.system-fileio;
}
1 change: 0 additions & 1 deletion pkgs/development/compilers/ghcjs-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -105,6 +105,5 @@ in stdenv.mkDerivation {

meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
meta.maintainers = [lib.maintainers.elvishjerricco];
meta.broken = true;
meta.hydraPlatforms = [];
}