Merge branch 'master' into staging

2018-06-30 01:41:59 +02:00
parent 3892a3e5a9 2059bf9e39
commit f7781f5293
998 changed files with 16501 additions and 10367 deletions
@@ -185,8 +185,6 @@ let
    setupHook = ./setup-hook-cross.sh;
  });
 in rec {
-  perl = perl524;
-
  perl522 = common {
    version = "5.22.4";
    sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms";
@@ -201,4 +199,9 @@ in rec {
    version = "5.26.2";
    sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp";
  };
+
+  perl528 = common {
+    version = "5.28.0";
+    sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky";
+  };
 }