Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: ef1e83d47c96
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: cbcd5aa08554
Choose a head ref
  • 12 commits
  • 9 files changed
  • 6 contributors

Commits on Oct 10, 2018

  1. Configuration menu
    Copy the full SHA
    fdaa426 View commit details
    Browse the repository at this point in the history
  2. haskellPackages.shellFor: Clean and fixup

    - Now correctly sets NIX_GHC* env vars
    infinisil authored and ElvishJerricco committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    08814b7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2bafa93 View commit details
    Browse the repository at this point in the history

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
  3. nixos/trezord: revised and updated udev rules

    (cherry picked from commit a88e0ef)
    Ján Hrnko committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    3c1ca59 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #49156 from 1000101/backport-release-18.09

    [18.09] nixos/trezord: revised and updated udev rules
    infinisil committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    9551f01 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2018

  1. pythonPackages.pyarrow: fix running tests on hydra

    This replaces standard checkPhase using setup.py that uses pytest-runner
    with an explicit call to pytest. One reason to do that is because
    setup.py triggers another rebuild when asked to do "test". Another
    reason is that there seems to be a conflict between possible imports for
    pyarrow: `pwd`/pyarrow vs $out/pyarrow. By some unknown reason this
    triggers an import error on hydra and ofborg, but not on my machine. The
    solution here is to remove `pwd`/pyarrow, keep the tests and use direct
    call to pytest (setup.py needs `pwd`/pyarrow). The added benefit is that
    we are now testing what is installed in $out.
    
    (cherry picked from commit 6ae3cb4)
    veprbl authored and FRidh committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    6b60c06 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cbcd5aa View commit details
    Browse the repository at this point in the history