Skip to content
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
base: e8228cb0f066
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9b36117af046
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 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
    cole-h committed Oct 5, 2020
    Copy the full SHA
    9f76b6e 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
    cole-h committed Oct 5, 2020
    Copy the full SHA
    c2c7a5c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #99657 from cole-h/fix-nix-shell-and-borg-20.09 

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