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
base: dc0af4d7b6e3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2b604c2836f3
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Nov 3, 2018

  1. Revert "Revert "stage.nix: pkgsi686Linux only works on x86 family"" 

    This reverts commit 08b5cff.
    @matthewbauer
    matthewbauer committed Nov 3, 2018
    Copy the full SHA
    b3ab4d1 View commit details
    Browse the repository at this point in the history

  2. treewide: remove pkgs_i686 

    This was getting evaluated eagerly causing assertion failures in
aarch64 systems. We can replace usages of pkgs_i686 with
pkgs.pkgsi686Linux.
    @matthewbauer
    matthewbauer committed Nov 3, 2018
    Copy the full SHA
    4a8fc5b View commit details
    Browse the repository at this point in the history

  3. stage.nix: throw error on incorrect pkgsi686Linux usage 

    pkgsi686Linux now throws an error with a message as opposed to the
previous assertion.
    @matthewbauer
    matthewbauer committed Nov 3, 2018
    Copy the full SHA
    370ce8f View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2018

  1. Merge pull request #49670 from matthewbauer/pkgs-i686-remove 

    Fix pkgsi686Linux assertion
    @matthewbauer
    matthewbauer committed Nov 4, 2018
    Copy the full SHA
    2b604c2 View commit details
    Browse the repository at this point in the history