Merge master into staging-next

2020-05-05 19:51:09 +02:00
parent 320f79365d 73dc3fc400
commit 9875bbae75
372 changed files with 3551 additions and 1619 deletions
@@ -28,7 +28,16 @@ let
  ] ++ extraPackages);

 in runCommand podman.name {
-  inherit (podman) name pname version meta outputs;
+  name = "${podman.pname}-wrapper-${podman.version}";
+  inherit (podman) pname version;
+
+  meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ];
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
  nativeBuildInputs = [
    makeWrapper
  ];