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: ac6599895725
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 07db0b248c4c
Choose a head ref
  • 4 commits
  • 5 files changed
  • 3 contributors

Commits on Jan 15, 2020

  1. Copy the full SHA
    ba9066a View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2020

  1. shellFor: Refactor for consistency and cross

    This makes it work like work-on-multi from Reflex Platform. In
    particular, rather than making `.env` from `shellFor`, we make `.env`
    the primitive, and `shellFor` works by combining together the arguments
    of all the packages to `generic-builder` and taking the `.env` of the
    resulting mashup-package.
    
    There are 2 benefits of this:
    
    1. The dependency logic is deduplicated. generic builder just concatted
       lists, whereas all the envs until now would sieve apart haskell and
       system build inputs. Now, they both decide haskell vs system the same
       way: according to the argument list and without reflection.
       Consistency is good, especially because it mean that if the build
       works, the shell is more likely to work.
    
    2. Cross is handled better. For native builds, because the
       `ghcWithPackages` calls would shadow, we through both the regular
       component (lib, exe, test, bench) haskell deps and Setup.hs haskell
       deps in the same `ghcWithPackages` call. But for cross builds we use
       `buildPackages.ghcWithPackages` to get the setup deps. This ensures
       everything works correctly.
    jmininger authored and Ericson2314 committed Jan 17, 2020
    Copy the full SHA
    7d67db3 View commit details
    Browse the repository at this point in the history
  2. release.nix: Make hydra build all unit tests

    We have just a few, and these are regular jobs not must-pass. The tests
    that were must-pass are left as is.
    Ericson2314 committed Jan 17, 2020
    Copy the full SHA
    cb46b97 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    07db0b2 View commit details
    Browse the repository at this point in the history