Merge staging-next into staging

2021-02-13 06:16:37 +00:00
parent 59a258cd35 318f95e4c2
commit 1e189fbb9e
33 changed files with 281 additions and 138 deletions
@@ -71,5 +71,7 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2;
    platforms = platforms.unix;
    maintainers = [ maintainers.eelco ];
+    # imager.c:70:2: error: unknown type name 'loff_t'; did you mean 'off_t'?
+    broken = stdenv.isDarwin;
  };
 }