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

Commits on Mar 6, 2020

  1. firefox: mark as broken on 32-bit buildPlatform

    volth committed Mar 6, 2020
    Copy the full SHA
    ed33a6c View commit details

Commits on Apr 5, 2020

  1. Merge pull request #81864 from volth/patch-389 

    firefox: mark as broken on 32-bit buildPlatform
    @flokli
    flokli authored Apr 5, 2020

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    29f491d View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/applications/networking/browsers/firefox/packages.nix
4 changes: 3 additions & 1 deletion pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, lib, callPackage, fetchurl }:
{ config, stdenv, lib, callPackage, fetchurl }:

let
common = opts: callPackage (import ./common.nix opts) {};
@@ -23,6 +23,8 @@ rec {
maintainers = with lib.maintainers; [ eelco andir ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
license = lib.licenses.mpl20;
};
updateScript = callPackage ./update.nix {