all-packages: fix earlier merge

pkgs/top-level/all-packages.nix

@@ -3911,7 +3911,6 @@ in
   };
 
   ipmitool = callPackage ../tools/system/ipmitool {
-    static = false;
     openssl = openssl_1_0_2;
   };
 
@@ -5267,24 +5266,6 @@ in
 
   pngout = callPackage ../tools/graphics/pngout { };
 
-  hurdPartedCross =
-    if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu"
-    then (makeOverridable
-            ({ hurd }:
-              (parted.override {
-                # Needs the Hurd's libstore.
-                inherit hurd;
-
-                # The Hurd wants a libparted.a.
-                enableStatic = true;
-
-                gettext = null;
-                readline = null;
-                devicemapper = null;
-              }).crossDrv)
-           { hurd = gnu.hurdCrossIntermediate; })
-    else null;
-
   ipsecTools = callPackage ../os-specific/linux/ipsec-tools {
     flex = flex_2_5_35;
     openssl = openssl_1_0_2;