-
-
Notifications
You must be signed in to change notification settings - Fork 104
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: ef1e83d47c96
head repository: NixOS/nixpkgs-channels
compare: cbcd5aa08554
- 12 commits
- 9 files changed
- 6 contributors
Commits on Oct 10, 2018
-
Configuration menu - View commit details
-
Copy full SHA for fdaa426 - Browse repository at this point
Copy the full SHA fdaa426View commit details -
haskellPackages.shellFor: Clean and fixup
- Now correctly sets NIX_GHC* env vars
Configuration menu - View commit details
-
Copy full SHA for 08814b7 - Browse repository at this point
Copy the full SHA 08814b7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2bafa93 - Browse repository at this point
Copy the full SHA 2bafa93View commit details
Commits on Oct 25, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 54dd052 - Browse repository at this point
Copy the full SHA 54dd052View commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for c80620f - Browse repository at this point
Copy the full SHA c80620fView commit details -
doc/breakpointHook: add documentation
(cherry picked from commit 325a569)
Configuration menu - View commit details
-
Copy full SHA for ccd398f - Browse repository at this point
Copy the full SHA ccd398fView commit details
Commits on Oct 26, 2018
-
doc: extend breakpointHook documentation
(cherry picked from commit 7f80fb2)
Configuration menu - View commit details
-
Copy full SHA for fcca810 - Browse repository at this point
Copy the full SHA fcca810View commit details -
Merge pull request #49099 from Mic92/breakpoint-backport
Backport breakpointHook [18.09]
Configuration menu - View commit details
-
Copy full SHA for c2ad4bf - Browse repository at this point
Copy the full SHA c2ad4bfView commit details -
nixos/trezord: revised and updated udev rules
(cherry picked from commit a88e0ef)
Ján Hrnko committedOct 26, 2018 Configuration menu - View commit details
-
Copy full SHA for 3c1ca59 - Browse repository at this point
Copy the full SHA 3c1ca59View commit details -
Merge pull request #49156 from 1000101/backport-release-18.09
[18.09] nixos/trezord: revised and updated udev rules
Configuration menu - View commit details
-
Copy full SHA for 9551f01 - Browse repository at this point
Copy the full SHA 9551f01View commit details
Commits on Oct 27, 2018
-
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)
Configuration menu - View commit details
-
Copy full SHA for 6b60c06 - Browse repository at this point
Copy the full SHA 6b60c06View commit details -
Configuration menu - View commit details
-
Copy full SHA for cbcd5aa - Browse repository at this point
Copy the full SHA cbcd5aaView commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff ef1e83d47c96...cbcd5aa08554