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

Commits on Oct 25, 2018

  1. cntr: init at 1.2.0

    (cherry picked from commit 84e915a)
    Mic92 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    54dd052 View commit details
    Browse the repository at this point in the history
  2. breakpointHook: add for debugging failing builds

    Usuage: Add breakpointHook to your `buildInputs` like this:
    
      stdenv.mkDerivation rec {
        # ...
        buildInputs = [ breakpointHook ];
      });
    
    When the build fails as show in this example:
    
      pkgs.hello.overrideAttrs (old: {
        buildInputs = [ breakpointHook ];
        postPatch = ''
          false
        '';
      });
    
    It will halt execution printing the following message:
    
    build failed in patchPhase with exit code 1
    To attach to this build run the following command as root:
    
       cntr attach -t command cntr-/nix/store/ynyb4n82x2r7sldd58pbb405jdqh5f00-hello-2.10
    
    Installing cntr and running the command will provide shell access to the
    build sandbox of failed build:
    
    sudo cntr attach -t command cntr-/nix/store/ynyb4n82x2r7sldd58pbb405jdqh5f00-hello-2.10
    WARNING: bad ownership on /nix/var/nix/profiles/per-user/root, should be 1000
    [nixbld@localhost:/var/lib/cntr]$
    
    At /var/lib/cntr the sandbox filesystem is mounted. All commands and
    files of the system are still accessible within the shell.
    To execute commands from the sandbox use the `cntr exec` subcommand.
    
    (cherry picked from commit f10b935)
    Mic92 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    c80620f View commit details
    Browse the repository at this point in the history
  3. doc/breakpointHook: add documentation

    (cherry picked from commit 325a569)
    Mic92 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    ccd398f View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. doc: extend breakpointHook documentation

    (cherry picked from commit 7f80fb2)
    Mic92 committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    fcca810 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #49099 from Mic92/breakpoint-backport

    Backport breakpointHook [18.09]
    Mic92 committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    c2ad4bf View commit details
    Browse the repository at this point in the history