Merge master into staging-next

pkgs/build-support/docker/examples.nix

@@ -176,4 +176,13 @@ rec {
       ];
     };
   };
+
+  # 12. example of running something as root on top of a parent image
+  # Regression test related to PR #52109
+  runAsRootParentImage = buildImage {
+    name = "runAsRootParentImage";
+    tag = "latest";
+    runAsRoot = "touch /example-file";
+    fromImage = bash;
+  };
 }

pkgs/build-support/fetchegg/builder.sh

@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-header "exporting egg ${eggName} (version $version) into $out"
-
-mkdir -p $out
-chicken-install -r "${eggName}:${version}"
-cp -r ${eggName}/* $out/
-
-stopNest

pkgs/build-support/fetchegg/default.nix

@@ -1,25 +0,0 @@
-# Fetches a chicken egg from henrietta using `chicken-install -r'
-# See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html
-
-{ stdenvNoCC, chicken }:
-{ name, version, md5 ? "", sha256 ? "" }:
-
-if md5 != "" then
-  throw "fetchegg does not support md5 anymore, please use sha256"
-else
-stdenvNoCC.mkDerivation {
-  name = "chicken-${name}-export-${version}";
-  builder = ./builder.sh;
-  nativeBuildInputs = [ chicken ];
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = sha256;
-
-  inherit version;
-
-  eggName = name;
-
-  impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
-}
-