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: f5a69a98d9ad
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 8ea36d732567
Choose a head ref
  • 5 commits
  • 5 files changed
  • 5 contributors

Commits on Apr 18, 2019

  1. steam: fix steamrt trying to use a missing setup.sh (#59326) 

    I was getting the following error after a Steam update:

    internal error: /steamrt/setup.sh is missing, this runtime is invalid or corrupted

The script is used to put things on PATH but it doesn't seem we need to do that.

(cherry picked from commit 098cf3b)
    @puffnfresh @srhb
    puffnfresh authored and srhb committed Apr 18, 2019
    Copy the full SHA
    595da06 View commit details
    Browse the repository at this point in the history

  2. amazon-image.nix: Resolve failure to include resize2fs 

    Since 34234dc, for resize2fs to be automatically included in
initrd, a filesystem needed for boot must be explicitly defined as an
ext* type filesystem.

(cherry picked from commit 261372b)
    @talyz @AmineChikhaoui
    talyz authored and AmineChikhaoui committed Apr 18, 2019
    Copy the full SHA
    74ef29e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #59848 from AmineChikhaoui/ec2-fix-resize2fs 

    ec2 image: fix resize2fs (cherry pick PR#57633)
    @lheckemann
    lheckemann committed Apr 18, 2019
    Copy the full SHA
    2f0eaa0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #59822 from srhb/backport-steam-fix-missing-setupsh 

    [19.03] steam: fix steamrt trying to use a missing setup.sh
    @srhb
    srhb committed Apr 18, 2019
    Copy the full SHA
    bc866ab View commit details
    Browse the repository at this point in the history

  5. zfsUnstable: 0.8.0-rc3 -> 0.8.0-rc4 

    (cherry picked from commit e3a83b5)
    @adisbladis
    adisbladis committed Apr 18, 2019
    Copy the full SHA
    8ea36d7 View commit details
    Browse the repository at this point in the history