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: 412a9e7d7c89
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d95aebbe0e72
Choose a head ref
  • 2 commits
  • 37 files changed
  • 2 contributors

Commits on Jan 22, 2021

  1. lib: Clean up how linux and gcc config is specified 

    The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
    @Ericson2314
    Ericson2314 committed Jan 22, 2021
    Copy the full SHA
    8929989 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #107214 from Ericson2314/linux-config-cleanup 

    lib: Clean up how linux and gcc config is specified
    @Ericson2314
    Ericson2314 committed Jan 22, 2021
    Copy the full SHA
    d95aebb View commit details
    Browse the repository at this point in the history