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/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -16,5 +16,6 @@ fetchzip {
    homepage = http://junicode.sourceforge.net/;
    description = "A Unicode font for medievalists";
    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2Plus;
  };
 }
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -49,5 +49,6 @@ stdenv.mkDerivation rec {
    homepage = http://linuxlibertine.sf.net;
    platforms = platforms.linux;
    maintainers = [ maintainers.volth ];
+    license = licenses.ofl;
  };
 }