Merge branch 'staging-next' into staging

Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
parent 98df4f6351 5b0398dc36
commit ded9a4b1aa
368 changed files with 5460 additions and 6226 deletions
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
    inherit (src.meta) homepage;
    description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
    platforms = platforms.linux;
+    license = licenses.gpl2;
    maintainers = with maintainers; [ primeos ];
  };
 }