Merge staging-next into staging

2021-04-24 00:16:20 +00:00
parent a78ed5cbdd 6e7c70d02d
commit 944e32775d
113 changed files with 4025 additions and 3287 deletions
@@ -635,13 +635,6 @@ in lib.makeScopeWithSplicing
    '';
  };

-  libkern = mkDerivation {
-    path = "lib/libkern";
-    version = "8.0";
-    sha256 = "1wirqr9bms69n4b5sr32g1b1k41hcamm7c9n7i8c440m73r92yv4";
-    meta.platforms = lib.platforms.netbsd;
-  };
-
  column = mkDerivation {
    path = "usr.bin/column";
    version = "8.0";