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: 5662c243026b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0385d69f878a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 1, 2018

  1. tests/containers-imperative: Include stdenvNoCC

    While building the container there are a few occasions where stdenvNoCC
    is used underneath. During the last staging merge, some change now tries
    to build texinfo during the test while building stdenvNoCC.
    
    With this change, I'm adding stdenvNoCC to the closure to make sure that
    even when we have future stdenv changes, it doesn't break (well, except
    if we do have another variation like stdenvNoCC that overrides stdenv).
    
    I haven't bisected the exact change, but I'd suspect that it could be
    one of the commits in #39457.
    
    This fixes the test and it no longer fails with the following error:
    
    error: unable to download 'http://ftpmirror.gnu.org/texinfo/texinfo-6.5.tar.xz': Couldn't resolve host name (6)
    builder for '/nix/store/r7sf1wjbnimwgnv276jh59nfnzw40x30-texinfo-6.5.tar.xz.drv' failed with exit code 1
    cannot build derivation '/nix/store/5w1pv788ayi1wahyy76i90yqv96ai4h5-texinfo-6.5.drv': 1 dependencies couldn't be built
    cannot build derivation '/nix/store/cnsfkf0j5xmm14zzm5a3a66pz66gbc82-stdenv-linux.drv': 1 dependencies couldn't be built
    cannot build derivation '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv': 1 dependencies couldn't be built
    error: build of '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv' failed
    /run/current-system/sw/bin/nixos-container: failed to build initial container configuration
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Cc: @aristidb, @edolstra, @chaoflow, @kampfschlaefer
    aszlig committed Jun 1, 2018
    Copy the full SHA
    0385d69 View commit details
    Browse the repository at this point in the history