Nikolay Amiantov 998fdfdc94 cups: fix path to socket and run directory ... We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be /run/cups.sock. Return it to default.		2018-02-23 18:51:37 +03:00
..
applications	Merge branch 'master' into staging	2018-02-23 18:51:08 +03:00
build-support	Merge branch 'master' into staging	2018-02-23 18:51:08 +03:00
common-updater	update-source-version: Fix regex metacharacter	2018-02-17 22:34:12 +02:00
data	Merge branch 'master' into staging	2018-02-23 18:51:08 +03:00
desktops	Merge pull request #35379 from vaibhavsagar/user-manager	2018-02-23 14:56:06 +08:00
development	Merge branch 'master' into staging	2018-02-23 18:51:08 +03:00
games	rogue: Fix build after ncurses5 changes	2018-02-23 06:21:11 +02:00
misc	cups: fix path to socket and run directory	2018-02-23 18:51:37 +03:00
os-specific	linux-copperhead: 4.15.4.a -> 4.15.5.a	2018-02-23 08:35:23 -05:00
servers	mattermost: 4.7.0 -> 4.7.2	2018-02-23 15:41:13 +00:00
shells
stdenv	Merge branch 'master' into staging	2018-02-20 20:33:40 +01:00
test
tools	Merge branch 'master' into staging	2018-02-23 18:51:08 +03:00
top-level	Merge branch 'master' into staging	2018-02-23 18:51:08 +03:00