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: b550b7d9e3d0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 10eec0013135
Choose a head ref
  • 6 commits
  • 3 files changed
  • 4 contributors

Commits on Oct 1, 2018

  1. dockerTools: Use nix instead of nixUnstable 

    (cherry picked from commit b256df4)
    @srhb @nlewo
    srhb authored and nlewo committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    ff37ba7 View commit details
    Browse the repository at this point in the history

  2. alacritty: 2018-08-30 -> 0.2.0 

    Based on popular demand I decided to upgraded alacritty from my own fork.
We currently also have a version in staging that works without but we
cannot easily backport this one because it relies on some changes in the rust
build infrastructure

(cherry picked from commit cb6ccb6)
    @Mic92
    Mic92 committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    2d84895 View commit details
    Browse the repository at this point in the history

  3. alacritty: restrict platforms to x86_64-{linux,darwin} 

    (cherry picked from commit 350c79f)
    @Mic92
    Mic92 committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    4412545 View commit details
    Browse the repository at this point in the history

  4. alacritty: spell darwin platform correctly 

    (cherry picked from commit 13b2903)
    @Mic92
    Mic92 committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    57a4034 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #47592 from Mic92/alacritty-backport 

    alacritty: 2018-08-30 -> 0.2.0 (backport)
    @Mic92
    Mic92 committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    ec3497a View commit details
    Browse the repository at this point in the history

  6. linux kernel: increase build timeout from 1hr to 4 hrs (#47564) 

    We've recently seen a lot of kernel build timeouts on hydra,
so let's increase the timeout.

(cherry picked from commit 83fd978 and
resolved conflict)
    @xeji
    xeji committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    10eec00 View commit details
    Browse the repository at this point in the history