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: c94ccfd81ed3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: df9334b64656
Choose a head ref
  • 7 commits
  • 33 files changed
  • 2 contributors

Commits on Nov 11, 2018

  1. tests: refactor to carry the package set as an argument

    This way, the package set will be possible to pass without re-importing
    all the time
    Ekleog committed Nov 11, 2018
    Copy the full SHA
    6c68fbd View commit details
    Browse the repository at this point in the history
  2. tests: split into a separate all-tests.nix file

    This will make the list much easier to re-use, eg. for `nixosTests`
    
    The drawback is that this approaches makes the
    ```
    nix-build release.nix -A tests.opensmtpd.x86_64-linux
    ```
    command about twice as slow (3s to 6s): it now has to evaluate `nixpkgs`
    once for each architecture, instead of just having the hardcoded list of
    tests that allowed to say “ok just evaluate for x86_64-linux”.
    
    On the other hand, complete evaluation of `release.nix` should be much
    faster because we no longer import `nixpkgs` for each test: testing with
    the following command went from 30s to 18s, and that's just for a few
    tests.
    ```
    time nix-instantiate --eval --strict nixos/release.nix -A tests.nat
    ```
    I initially wanted to test on the whole `release.nix`, but there are too
    many broken tests and it takes too long to eval them all, especially
    compared to the fact that the current implementation breaks some setup.
    
    Given developers can just `nix-build nixos/tests/my-test.nix`, it sounds
    like an overall win.
    Ekleog committed Nov 11, 2018
    Copy the full SHA
    83b27f6 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    aade4e5 View commit details
    Browse the repository at this point in the history
  4. meta.tests: drop meta.needsVMSupport

    Its job is already handled by `requiredSystemFeatures`
    Ekleog committed Nov 11, 2018
    Copy the full SHA
    cae5598 View commit details
    Browse the repository at this point in the history
  5. meta.tests: rename into passthru.tests

    Nix currently rejects derivations in `meta` values. This works around
    that limitation by using `passthru` instead.
    
    Closes #50230
    Ekleog committed Nov 11, 2018
    Copy the full SHA
    2986ce1 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    6aedf6a View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2018

  1. Merge pull request #50233 from Ekleog/fix-test-system

    Fix meta.tests system
    Ericson2314 committed Nov 12, 2018
    Copy the full SHA
    df9334b View commit details
    Browse the repository at this point in the history