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: ac6e90696887
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f8c12edfdf2e
Choose a head ref
  • 4 commits
  • 6 files changed
  • 2 contributors

Commits on May 31, 2019

  1. Revert "extlinux-conf: fix cross compilation" 

    This reverts commit f17dd04.
    @kampka
    kampka committed May 31, 2019
    2
    Copy the full SHA
    fd15f37 View commit details
    Browse the repository at this point in the history

  2. Revert "treewide: use buildPackages for config builders" 

    This reverts commit 35af6e3.
    @kampka
    kampka committed May 31, 2019
    Copy the full SHA
    0d570e0 View commit details
    Browse the repository at this point in the history

  3. treewide: use buildPackages for config builders 

    Partially reapplies 35af6e3

buildPackages need to be used only for image builders.
Otherwise, the bootloader builder may be setup using the wrong arch,
rendering it unusable
    @matthewbauer @kampka
    matthewbauer authored and kampka committed May 31, 2019
    Copy the full SHA
    f2a8948 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. Merge pull request #62333 from kampka/buildPackages-for-config-builders 

    Build packages for config builders
    @matthewbauer
    matthewbauer committed Jun 5, 2019
    Copy the full SHA
    f8c12ed View commit details
    Browse the repository at this point in the history