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: dc0af4d7b6e3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b3ab4d1 View commit details

  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

    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
    4a8fc5b View commit details

  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

Commits on Nov 4, 2018

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

    Fix pkgsi686Linux assertion
    @matthewbauer
    matthewbauer authored Nov 4, 2018
    Copy the full SHA
    2b604c2 View commit details
Loading