Merge branch 'master' into staging-next

Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
parent 580cab57e4 bb3f7d14a1
commit 00df25ee57
298 changed files with 3752 additions and 5727 deletions
--- a/pkgs/misc/emulators/dosbox/unstable.nix
+++ b/pkgs/misc/emulators/dosbox/unstable.nix
@@ -36,5 +36,6 @@ in stdenv.mkDerivation rec {
    description = "A DOS emulator";
    platforms = stdenv.lib.platforms.unix;
    maintainers = with stdenv.lib.maintainers; [ binarin ];
+    license = stdenv.lib.licenses.gpl2Plus;
  };
 }