Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2015-07-22 22:33:55 +02:00
130 changed files with 1026 additions and 755 deletions
@@ -4,7 +4,7 @@
, utils ? false, suffix ? "glib"
}:
let
let # beware: updates often break cups_filters build
version = "0.34.0"; # even major numbers are stable
sha256 = "1c2wa4pfzqmvzq1jpp3ps5nmzz745gcg8dnpwqpfdccy5ydbm90v";
in