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: e83908c966ed
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d861ca40a311
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 9, 2020

  1. nixos/config: add defaultPackages option 

    readd perl (used in shell scripts), rsync (needed for NixOps) and strace (common debugging tool)

they where previously removed in #91213

Co-authored-by: Timo Kaufmann <timokau@zoho.com>
Co-authored-by: 8573 <8573@users.noreply.github.com>
(cherry picked from commit 74b3d66)
    @davidak
    davidak committed Sep 9, 2020
    Copy the full SHA
    b78318e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #97489 from davidak/backport-defaultPackages 

    [20.09] add defaultPackages option
    @worldofpeace
    worldofpeace committed Sep 9, 2020
    Copy the full SHA
    d861ca4 View commit details
    Browse the repository at this point in the history