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: c4adce71d8e6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 547ef77aa748
Choose a head ref
  • 5 commits
  • 7 files changed
  • 2 contributors

Commits on Jul 9, 2018

  1. lib: Use lib.fixed-points.extends to avoid repetition

    @Ericson2314
    Ericson2314 committed Jul 9, 2018
    4 Configuration menu
    Copy the full SHA
    48ccdf3 View commit details
    Browse the repository at this point in the history

  2. top-level: Expose splicePackages for newScope users 

    Otherwise extra packages in scope can't be made to work for cross. As
much as I think splicing is an evil trick, I think it's best to do this
and at least have it work consistently for now.

It would seems simpler to expose a `newScopeWithSplicing`, but there's a
few attrs (like `buildPackages` or `buildHaskellPackages`) that
shouldn't be spliced. Users should instead splice, override the splicing
on those packages, and apply `newScope` to that.
    @Ericson2314
    Ericson2314 committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    0eb142c View commit details
    Browse the repository at this point in the history

  3. Haskell infra: Do callPackage splicing

    @Ericson2314
    Ericson2314 committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    f27f491 View commit details
    Browse the repository at this point in the history

  4. haskell infra: Fix built-time overrides 

    These should all come from `buildHaskellPackages`
    @Ericson2314
    Ericson2314 committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    740cfff View commit details
    Browse the repository at this point in the history

  5. Merge pull request #43264 from obsidiansystems/splice-more 

    haskell infra: Use splicing like normal `callPackage`
    @Ericson2314
    Ericson2314 committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    547ef77 View commit details
    Browse the repository at this point in the history