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: a652099c46ce
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0b8e3898705f
Choose a head ref
  • 9 commits
  • 15 files changed
  • 3 contributors

Commits on Jan 13, 2017

  1. top-level: Modernize stdenv.overrides giving it self and super 

    Document breaking change in 17.03 release notes
    @Ericson2314
    Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    0ef8b69 View commit details
    Browse the repository at this point in the history

  2. top-level: Normalize stdenv booting 

    Introduce new abstraction, `stdenv/booter.nix` for composing bootstraping
stages, and use it everywhere for consistency. See that file for more doc.

Stdenvs besides Linux and Darwin are completely refactored to utilize this.
Those two, due to their size and complexity, are minimally edited for
easier reviewing.

No hashes should be changed.
    @Ericson2314
    Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    3e197f7 View commit details
    Browse the repository at this point in the history

  3. top-level: Do stdenvOverrides in stage.nix even if crossSystem exists. 

    Instead, the cross stdenv will patch up the override field -- the complexity
is now confined to the one place it matters.
    @DavidEGrayson @Ericson2314
    DavidEGrayson authored and Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    0f33b9f View commit details
    Browse the repository at this point in the history

  4. top-level: Inherit system and platform in stage.nix not all-packa… 

    …ges.nix

These are not packages, and so its more elegant to do this outside of
all-packages.nix.
    @Ericson2314
    Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    67ebd31 View commit details
    Browse the repository at this point in the history

  5. linux stdenv: Utilize overrides and prevStage better 

    `gcc-unwrapped` basically replaces `gccPlain`. It may seem like an ugly
polution to stick it in all-packages, but a future PR will enshrine this
`*-unwrapped` pattern. In any event, the long term goal is stdenvs might
need to tweak how compilers are booted and wrapped, but the code to build
the unwrapped compilers themselves should be generic.
    @Ericson2314
    Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    6a45e91 View commit details
    Browse the repository at this point in the history

  6. linux stdenv: Remove stray use of stage0 to bootstrap more elegantly

    @Ericson2314
    Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    b10f415 View commit details
    Browse the repository at this point in the history

  7. linux stdenv: Inline stage funs to conform to new convention 

    Code is just moved around
    @Ericson2314
    Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    ff35560 View commit details
    Browse the repository at this point in the history

  8. stdenv/booter.nix: Add longer note explaining indexing

    @Ericson2314
    Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    abaf790 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #21415 from Ericson2314/normalize-boot 

    Normalize bootstrapping
    @Ericson2314
    Ericson2314 committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    0b8e389 View commit details
    Browse the repository at this point in the history