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: c2eca910059b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f761c14fd2f1
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 3, 2020

  1. nixos/test-driver: Specify /bin/sh shell when running a bourne shell … 

    …script as the user

(cherry picked from commit 751a270)

Reason: Back-porting this straight-forward fix is the best way to
allow tests affected by this user-shell problem to run in 20.03.
There isn't a great override point to apply just this fix.  Copy/pasting
testing-python.nix just to specify a new test-driver.py isn't great --
it would cut off receiving any other fixes in the testing infrastructure
until 20.09.  A 20.03 system using testing-python.nix from the unstable
branch and then passing 20.03's pkgs in to avoid getting unstable's
pkgs is quite a bit of configuration to expect from clients and seems
fragile against future changes in the unstable branch that expect pkgs
to be mostly in-sync with the test driver.  Both of these not-great
options leave a bunch of "TODO: Remove after 20.09" junk in clients'
configs & make that upgrade harder.
    @chkno
    chkno authored and Jon committed Jul 3, 2020
    Copy the full SHA
    f761c14 View commit details
    Browse the repository at this point in the history