nixpkgs/pkgs
Andreas Rammhold db0fe5c3eb
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.
2020-10-28 03:03:27 +01:00
..
applications Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
build-support Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
common-updater
data Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
desktops Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
development Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
games Merge pull request from andir/steam-desktop 2020-10-27 12:33:24 -04:00
misc Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
os-specific Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
pkgs-lib
servers Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
shells Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
stdenv Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
test Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
tools Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00
top-level Merge branch master into staging to fix eval error 2020-10-28 03:03:27 +01:00