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

Commits on Jul 5, 2018

  1. stage: refactor extraPkgs 

    I have renamed the overlay to “otherPackageSets” because I think that
is more descriptive.

pkgsLocal has been removed because there were concerns that it would
be confusing. None of the other names seemed very useful so I think it
is best to avoid it altogether. pkgsCross is still included,
hopefully, that will not have as much confusion.

pkgsMusl is now available for building Musl packages. It will give you
packages bulit with the Musl libc.

Also added more documentation.

/cc @dezgeg @Ericson2314 @dtzWill
    @matthewbauer
    matthewbauer committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    5b357d9 View commit details
    Browse the repository at this point in the history

  2. treewide: remove callPackage_i686 

    This has been replaced with pkgsi686Linux.callPackage
    @matthewbauer
    matthewbauer committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    c491a99 View commit details
    Browse the repository at this point in the history

  3. treewide: remove forceSystem

    @matthewbauer
    matthewbauer committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    69f1045 View commit details
    Browse the repository at this point in the history

  4. stage: Make pkgsMusl and pkgsi686linux respect the original local… 

    …System more

For example:

nix-repl> pkgsi686Linux.pkgsMusl.hostPlatform.config
"i686-unknown-linux-musl"

nix-repl> pkgsMusl.pkgsi686Linux.hostPlatform.config
"i686-unknown-linux-musl"
    @Ericson2314
    Ericson2314 committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    f795ed7 View commit details
    Browse the repository at this point in the history

  5. stage: add Linux checks 

    This prevent us evaluation on macOS systems where pkgsMusl &
pkgsi686Linux is unsupported.
    @matthewbauer
    matthewbauer committed Jul 5, 2018
    1 Configuration menu
    Copy the full SHA
    ad20a4a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #43079 from matthewbauer/rework-extra-pkgs 

    Rework stage.nix's extraPkgs
    @matthewbauer
    matthewbauer committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    bb0febf View commit details
    Browse the repository at this point in the history