Merge staging-next into staging

2021-03-31 00:12:32 +00:00
parent 01b3d1558f 4ba71fb819
commit cb1554f24c
22 changed files with 454 additions and 214 deletions
@@ -83,9 +83,9 @@ stdenv.mkDerivation (
    '';
  }

-  // args //
+  // removeAttrs args [ "lib" ] # Propagating lib causes the evaluation to fail, because lib is a function that can't be converted to a string

-  {
+  // {
    name = name + (if src ? version then "-" + src.version else "");

    postHook = ''