Merge branch 'master' into staging-next

This commit is contained in:
Daiderd Jordan
2018-10-01 19:42:07 +02:00
385 changed files with 12348 additions and 6335 deletions
+8 -10
View File
@@ -79,6 +79,7 @@ let
"-Dlocincpth=${libcInc}/include"
"-Dloclibpth=${libcLib}/lib"
]
++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]
++ optional stdenv.isSunOS "-Dcc=gcc"
++ optional enableThreading "-Dusethreads";
@@ -174,23 +175,20 @@ let
setupHook = ./setup-hook-cross.sh;
});
in rec {
perl522 = common {
version = "5.22.4";
sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms";
};
perl524 = common {
version = "5.24.4";
sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz";
};
perl526 = common {
version = "5.26.2";
sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp";
};
# the latest Maint version
perl528 = common {
version = "5.28.0";
sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky";
};
# the latest Devel version
perldevel = common {
version = "5.29.3";
sha256 = "054xi629408p2hv9475jghv6zd1bj69qqpiby8cy9qw5vismgi17";
};
}