Merge staging-next into staging

2019-04-11 07:52:44 +02:00
parent be62e46e8e 230c67f43b
commit c6341c279b
129 changed files with 2451 additions and 3500 deletions
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
    platforms = stdenv.lib.platforms.unix;
    # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
+    license = stdenv.lib.licenses.gpl2;
  };
 }