Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00
parent 2363660191 2d1aafef55
commit d605663ae2
155 changed files with 4271 additions and 2114 deletions
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -3,10 +3,10 @@ let
  s = # Generated upstream information
  rec {
    baseName="angelscript";
-    version = "2.30.0";
+    version = "2.30.1";
    name="${baseName}-${version}";
    url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "00w7h2g6g1lkq9ahsvzyk78nbdzhn1adsrns9mrqb2fbxv2wbz5d";
+    sha256 = "10ym7185h26gzmw5v6wz8zlycw8gzygv0aw87dmgjcyy7qfk74m4";
  };
  buildInputs = [
    unzip