Merge branch 'master' into staging-next

There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
This commit is contained in:
Vladimír Čunát
2019-07-06 13:44:40 +02:00
337 changed files with 11109 additions and 8836 deletions
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
description = "A core component for zathura PDF viewer";
license = licenses.zlib;
platforms = platforms.unix;
maintainers = with maintainers; [ garbas ];
maintainers = with maintainers; [ ];
};
}
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.zlib;
platforms = platforms.unix;
maintainers = with maintainers; [ garbas ];
maintainers = with maintainers; [ ];
};
}
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.zlib;
platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan garbas ];
maintainers = with maintainers; [ cstrahan ];
};
}
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.zlib;
platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan garbas ];
maintainers = with maintainers; [ cstrahan ];
};
}
+1 -1
View File
@@ -27,6 +27,6 @@ in symlinkJoin {
'';
license = licenses.zlib;
platforms = platforms.unix;
maintainers = with maintainers;[ garbas smironov ];
maintainers = with maintainers;[ smironov ];
};
}