0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-10-30 17:16:07 -07:00
commit dd2de66d61
320 changed files with 26241 additions and 2581 deletions

View file

@ -174,7 +174,7 @@ in
# Swap devices.
${flip concatMapStrings config.swapDevices (sw:
"${sw.device} none swap${prioOption sw.priority}\n"
"${sw.realDevice} none swap${prioOption sw.priority}\n"
)}
'';