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: 0d0660fde3bb
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 06ce0d954b65
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 5, 2020

  1. Revert "top-level: fix nix-shell eval w/nixUnstable"

    This reverts commit fa6064a.
    
    (cherry picked from commit d91cab8)
    cole-h committed Oct 5, 2020
    Copy the full SHA
    0872da1 View commit details
    Browse the repository at this point in the history
  2. top-level: ignore unexpected args

    This fixes both `nix-shell` failing to eval with `nixUnstable`, as well
    as ofborg's failure to eval on aarch64 due to passing an "unexpected
    arg" (https://github.com/NixOS/ofborg/blob/1112e3a8c8621203fae71283d700e0383b5e1e80/ofborg/src/nix.rs#L334-L340).
    
    (cherry picked from commit 11eddd6)
    cole-h committed Oct 5, 2020
    Copy the full SHA
    b2a04c5 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #99661 from cole-h/fix-nix-shell-and-borg-20.03

    [20.03] top-level: ignore unexpected args
    worldofpeace committed Oct 5, 2020
    Copy the full SHA
    041a242 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2020

  1. thunderbird*: switch default: 68 -> 78

    I didn't feel comfortable with *immediately* removing 68,
    even though nixers have rollbacks etc.
    
    (cherry picked from commit 2be2283)
    It's not nice, but the 68 branch seems unsupported upstream now,
    and soon it will surely contain public vulnerabilities.
    vcunat committed Oct 6, 2020
    Copy the full SHA
    06ce0d9 View commit details
    Browse the repository at this point in the history