Merge branch 'master' into staging

Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
parent 98f2f08b4b 97e376bf9c
commit ad35019501
116 changed files with 1596 additions and 521 deletions
@@ -43,8 +43,8 @@ in
  };

  ragelDev = generic {
-    version = "7.0.0.10";
-    sha256 = "1v4ddzxal4gf8l8nkn32qabba6nbpd2mg8sphgmdn8kaqv52nmj0";
+    version = "7.0.0.11";
+    sha256 = "0h2k9bfz9i7x9mvr9rbsrzz8fk17756zwwrkf3fppvm9ivzwdfh8";
    license = stdenv.lib.licenses.mit;
  };
 }