Merge staging-next into staging

2020-08-27 08:37:03 +02:00
parent 25ac498482 52095e171f
commit 13d93aabfb
21 changed files with 6126 additions and 4047 deletions
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "Free touch typing tutor program";
    homepage = "http://klavaro.sourceforge.net/";
+    changelog = "https://sourceforge.net/p/klavaro/code/HEAD/tree/trunk/ChangeLog";
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ mimame davidak ];