diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-10-28 03:00:32 +0100 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2020-10-28 03:03:27 +0100 |
| commit | db0fe5c3eb1d680fb8c635f8e327c412528eba90 (patch) | |
| tree | eb73686ee894bbc2d528824803dacf5bc914f28f /pkgs | |
| parent | 5d03fe6ac4b2e5e4132bb6f893380544ae2cf008 (diff) | |
| parent | c127653b72574199463a73a56e1809223eaec0df (diff) | |
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
Diffstat (limited to 'pkgs')