Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00
parent 1747d28e5a 888efed972
commit 33e1c78ae3
139 changed files with 1301 additions and 1116 deletions
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    description = "A suite of programs for processing MPEG or MJPEG video";
-    homepage = http://mjpeg.sourceforge.net/;
+    homepage = "http://mjpeg.sourceforge.net/";
    license = licenses.gpl2;
    platforms = platforms.unix;
    maintainers = with maintainers; [ abbradar ];