Merge remote-tracking branch 'origin/master' into staging

2018-08-21 15:41:53 -05:00
parent 9c35796ee3 28e51c7cea
commit 379fc894de
351 changed files with 5483 additions and 2969 deletions
@@ -146,6 +146,7 @@ let
    meta = {
      homepage = https://www.perl.org/;
      description = "The standard implementation of the Perl 5 programmming language";
+      license = licenses.artistic1;
      maintainers = [ maintainers.eelco ];
      platforms = platforms.all;
    };