Skip to content

Commit ee9c59c

Browse files
Ericson2314Ericson2314
committedOct 18, 2017
Merge remote-tracking branch 'channels/nixpkgs-unstable' into staging
2 parents cae2a8c + 00e56fb commit ee9c59c

File tree

55 files changed

+2549
-1108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2549
-1108
lines changed
 

‎doc/introduction.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org).
4848

4949
The current Nix expressions of the channels are available in the
5050
[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository,
51-
which has branches corresponding to the available channels. There is also the
52-
[Nixpkgs Monitor](http://monitor.nixos.org) which keeps track of updates
53-
and security vulnerabilities.
51+
which has branches corresponding to the available channels.

‎lib/systems/platforms.nix

+3
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,9 @@ rec {
545545
# Cavium ThunderX stuff.
546546
PCI_HOST_THUNDER_ECAM y
547547
548+
# Nvidia Tegra stuff.
549+
PCI_TEGRA y
550+
548551
# The default (=y) forces us to have the XHCI firmware available in initrd,
549552
# which our initrd builder can't currently do easily.
550553
USB_XHCI_TEGRA m

0 commit comments

Comments
 (0)
Please sign in to comment.