treewide: remove redundant rec

6 files changed, 161 insertions, 161 deletions

diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/pkgs/tools/package-management/cargo-download/crates-io.nix
index d120a05e00d..e0c0abf4dc6 100644
--- a/pkgs/tools/package-management/cargo-download/crates-io.nix
+++ b/pkgs/tools/package-management/cargo-download/crates-io.nix
@@ -14,7 +14,7 @@ rec {
     authors = [ "Remi Rampin <remirampin@gmail.com>" ];
     sha256 = "1974q3nysai026zhz24df506cxwi09jdzqksll4h7ibpb5n9g1d4";
   };
-  features_.adler32."1.0.2" = deps: f: updateFeatures f (rec {
+  features_.adler32."1.0.2" = deps: f: updateFeatures f ({
     adler32."1.0.2".default = (f.adler32."1.0.2".default or true);
   }) [];
 
@@ -35,7 +35,7 @@ rec {
       (crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps)
     ]);
   };
-  features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec {
+  features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({
     aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true);
     memchr."${deps.aho_corasick."0.5.3".memchr}".default = true;
   }) [
@@ -53,7 +53,7 @@ rec {
     authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ];
     sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
   };
-  features_.ansi_term."0.9.0" = deps: f: updateFeatures f (rec {
+  features_.ansi_term."0.9.0" = deps: f: updateFeatures f ({
     ansi_term."0.9.0".default = (f.ansi_term."0.9.0".default or true);
   }) [];
 
@@ -110,7 +110,7 @@ rec {
       (crates."winapi"."${deps."atty"."0.2.3"."winapi"}" deps)
     ]) else []);
   };
-  features_.atty."0.2.3" = deps: f: updateFeatures f (rec {
+  features_.atty."0.2.3" = deps: f: updateFeatures f ({
     atty."0.2.3".default = (f.atty."0.2.3".default or true);
     kernel32_sys."${deps.atty."0.2.3".kernel32_sys}".default = true;
     libc."${deps.atty."0.2.3".libc}".default = (f.libc."${deps.atty."0.2.3".libc}".default or false);
@@ -138,7 +138,7 @@ rec {
       (crates."safemem"."${deps."base64"."0.9.3"."safemem"}" deps)
     ]);
   };
-  features_.base64."0.9.3" = deps: f: updateFeatures f (rec {
+  features_.base64."0.9.3" = deps: f: updateFeatures f ({
     base64."0.9.3".default = (f.base64."0.9.3".default or true);
     byteorder."${deps.base64."0.9.3".byteorder}".default = true;
     safemem."${deps.base64."0.9.3".safemem}".default = true;
@@ -158,7 +158,7 @@ rec {
     authors = [ "The Rust Project Developers" ];
     sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
   };
-  features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec {
+  features_.bitflags."0.7.0" = deps: f: updateFeatures f ({
     bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true);
   }) [];
 
@@ -196,7 +196,7 @@ rec {
     sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
     features = mkFeatures (features."bitflags"."1.0.4" or {});
   };
-  features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+  features_.bitflags."1.0.4" = deps: f: updateFeatures f ({
     bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
   }) [];
 
@@ -288,7 +288,7 @@ rec {
       (crates."time"."${deps."cargo_download"."0.1.2"."time"}" deps)
     ]);
   };
-  features_.cargo_download."0.1.2" = deps: f: updateFeatures f (rec {
+  features_.cargo_download."0.1.2" = deps: f: updateFeatures f ({
     ansi_term."${deps.cargo_download."0.1.2".ansi_term}".default = true;
     cargo_download."0.1.2".default = (f.cargo_download."0.1.2".default or true);
     clap."${deps.cargo_download."0.1.2".clap}".default = true;
@@ -344,7 +344,7 @@ rec {
     authors = [ "Skyler Lipthay <skyler.lipthay@gmail.com>" ];
     sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n";
   };
-  features_.case."0.1.0" = deps: f: updateFeatures f (rec {
+  features_.case."0.1.0" = deps: f: updateFeatures f ({
     case."0.1.0".default = (f.case."0.1.0".default or true);
   }) [];
 
@@ -383,7 +383,7 @@ rec {
     authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
     sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
   };
-  features_.cfg_if."0.1.2" = deps: f: updateFeatures f (rec {
+  features_.cfg_if."0.1.2" = deps: f: updateFeatures f ({
     cfg_if."0.1.2".default = (f.cfg_if."0.1.2".default or true);
   }) [];
 
@@ -402,7 +402,7 @@ rec {
       (crates."time"."${deps."chrono"."0.2.25"."time"}" deps)
     ]);
   };
-  features_.chrono."0.2.25" = deps: f: updateFeatures f (rec {
+  features_.chrono."0.2.25" = deps: f: updateFeatures f ({
     chrono."0.2.25".default = (f.chrono."0.2.25".default or true);
     num."${deps.chrono."0.2.25".num}".default = (f.num."${deps.chrono."0.2.25".num}".default or false);
     time."${deps.chrono."0.2.25".time}".default = true;
@@ -542,7 +542,7 @@ rec {
       (crates."custom_derive"."${deps."conv"."0.3.3"."custom_derive"}" deps)
     ]);
   };
-  features_.conv."0.3.3" = deps: f: updateFeatures f (rec {
+  features_.conv."0.3.3" = deps: f: updateFeatures f ({
     conv."0.3.3".default = (f.conv."0.3.3".default or true);
     custom_derive."${deps.conv."0.3.3".custom_derive}".default = true;
   }) [
@@ -610,7 +610,7 @@ rec {
     ]);
     features = mkFeatures (features."core_foundation_sys"."0.5.1" or {});
   };
-  features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f (rec {
+  features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f ({
     core_foundation_sys."0.5.1".default = (f.core_foundation_sys."0.5.1".default or true);
     libc."${deps.core_foundation_sys."0.5.1".libc}".default = true;
   }) [
@@ -628,7 +628,7 @@ rec {
     authors = [ "Sam Rijs <srijs@airpost.net>" "Alex Crichton <alex@alexcrichton.com>" ];
     sha256 = "1rwvhb98w41mk5phr84mryally58f68h0v933772gdxqvqbcayqy";
   };
-  features_.crc32fast."1.1.1" = deps: f: updateFeatures f (rec {
+  features_.crc32fast."1.1.1" = deps: f: updateFeatures f ({
     crc32fast."1.1.1".default = (f.crc32fast."1.1.1".default or true);
   }) [];
 
@@ -644,7 +644,7 @@ rec {
     sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq";
     features = mkFeatures (features."crossbeam"."0.2.10" or {});
   };
-  features_.crossbeam."0.2.10" = deps: f: updateFeatures f (rec {
+  features_.crossbeam."0.2.10" = deps: f: updateFeatures f ({
     crossbeam."0.2.10".default = (f.crossbeam."0.2.10".default or true);
   }) [];
 
@@ -663,7 +663,7 @@ rec {
       (crates."crossbeam_utils"."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps)
     ]);
   };
-  features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f (rec {
+  features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f ({
     crossbeam_deque."0.6.2".default = (f.crossbeam_deque."0.6.2".default or true);
     crossbeam_epoch."${deps.crossbeam_deque."0.6.2".crossbeam_epoch}".default = true;
     crossbeam_utils."${deps.crossbeam_deque."0.6.2".crossbeam_utils}".default = true;
@@ -798,7 +798,7 @@ rec {
       (crates."syn"."${deps."derive_error"."0.0.3"."syn"}" deps)
     ]);
   };
-  features_.derive_error."0.0.3" = deps: f: updateFeatures f (rec {
+  features_.derive_error."0.0.3" = deps: f: updateFeatures f ({
     case."${deps.derive_error."0.0.3".case}".default = true;
     derive_error."0.0.3".default = (f.derive_error."0.0.3".default or true);
     quote."${deps.derive_error."0.0.3".quote}".default = true;
@@ -820,7 +820,7 @@ rec {
     authors = [ "David Tolnay <dtolnay@gmail.com>" ];
     sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw";
   };
-  features_.dtoa."0.4.2" = deps: f: updateFeatures f (rec {
+  features_.dtoa."0.4.2" = deps: f: updateFeatures f ({
     dtoa."0.4.2".default = (f.dtoa."0.4.2".default or true);
   }) [];
 
@@ -907,7 +907,7 @@ rec {
     authors = [ "Ben Wilber <benwilber@gmail.com>" ];
     sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip";
   };
-  features_.exitcode."1.1.2" = deps: f: updateFeatures f (rec {
+  features_.exitcode."1.1.2" = deps: f: updateFeatures f ({
     exitcode."1.1.2".default = (f.exitcode."1.1.2".default or true);
   }) [];
 
@@ -931,7 +931,7 @@ rec {
       (crates."libc"."${deps."filetime"."0.1.14"."libc"}" deps)
     ]) else []);
   };
-  features_.filetime."0.1.14" = deps: f: updateFeatures f (rec {
+  features_.filetime."0.1.14" = deps: f: updateFeatures f ({
     cfg_if."${deps.filetime."0.1.14".cfg_if}".default = true;
     filetime."0.1.14".default = (f.filetime."0.1.14".default or true);
     libc."${deps.filetime."0.1.14".libc}".default = true;
@@ -997,7 +997,7 @@ rec {
     sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip";
     libPath = "lib.rs";
   };
-  features_.fnv."1.0.6" = deps: f: updateFeatures f (rec {
+  features_.fnv."1.0.6" = deps: f: updateFeatures f ({
     fnv."1.0.6".default = (f.fnv."1.0.6".default or true);
   }) [];
 
@@ -1015,7 +1015,7 @@ rec {
       (crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps)
     ]);
   };
-  features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec {
+  features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({
     foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true);
     foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true;
   }) [
@@ -1033,7 +1033,7 @@ rec {
     authors = [ "Steven Fackler <sfackler@gmail.com>" ];
     sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5";
   };
-  features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec {
+  features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({
     foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true);
   }) [];
 
@@ -1051,7 +1051,7 @@ rec {
       (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps)
     ]);
   };
-  features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f (rec {
+  features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f ({
     fuchsia_zircon."0.2.1".default = (f.fuchsia_zircon."0.2.1".default or true);
     fuchsia_zircon_sys."${deps.fuchsia_zircon."0.2.1".fuchsia_zircon_sys}".default = true;
   }) [
@@ -1073,7 +1073,7 @@ rec {
       (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
     ]);
   };
-  features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+  features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({
     bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
     fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
     fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
@@ -1096,7 +1096,7 @@ rec {
       (crates."bitflags"."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps)
     ]);
   };
-  features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f (rec {
+  features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f ({
     bitflags."${deps.fuchsia_zircon_sys."0.2.0".bitflags}".default = true;
     fuchsia_zircon_sys."0.2.0".default = (f.fuchsia_zircon_sys."0.2.0".default or true);
   }) [
@@ -1114,7 +1114,7 @@ rec {
     authors = [ "Raph Levien <raph@google.com>" ];
     sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
   };
-  features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+  features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({
     fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
   }) [];
 
@@ -1206,7 +1206,7 @@ rec {
     ]);
     features = mkFeatures (features."h2"."0.1.13" or {});
   };
-  features_.h2."0.1.13" = deps: f: updateFeatures f (rec {
+  features_.h2."0.1.13" = deps: f: updateFeatures f ({
     byteorder."${deps.h2."0.1.13".byteorder}".default = true;
     bytes."${deps.h2."0.1.13".bytes}".default = true;
     fnv."${deps.h2."0.1.13".fnv}".default = true;
@@ -1247,7 +1247,7 @@ rec {
       (crates."itoa"."${deps."http"."0.1.14"."itoa"}" deps)
     ]);
   };
-  features_.http."0.1.14" = deps: f: updateFeatures f (rec {
+  features_.http."0.1.14" = deps: f: updateFeatures f ({
     bytes."${deps.http."0.1.14".bytes}".default = true;
     fnv."${deps.http."0.1.14".fnv}".default = true;
     http."0.1.14".default = (f.http."0.1.14".default or true);
@@ -1454,7 +1454,7 @@ rec {
       (crates."unicode_normalization"."${deps."idna"."0.1.4"."unicode_normalization"}" deps)
     ]);
   };
-  features_.idna."0.1.4" = deps: f: updateFeatures f (rec {
+  features_.idna."0.1.4" = deps: f: updateFeatures f ({
     idna."0.1.4".default = (f.idna."0.1.4".default or true);
     matches."${deps.idna."0.1.4".matches}".default = true;
     unicode_bidi."${deps.idna."0.1.4".unicode_bidi}".default = true;
@@ -1506,7 +1506,7 @@ rec {
       (crates."winapi"."${deps."iovec"."0.1.1"."winapi"}" deps)
     ]) else []);
   };
-  features_.iovec."0.1.1" = deps: f: updateFeatures f (rec {
+  features_.iovec."0.1.1" = deps: f: updateFeatures f ({
     iovec."0.1.1".default = (f.iovec."0.1.1".default or true);
     libc."${deps.iovec."0.1.1".libc}".default = true;
     winapi."${deps.iovec."0.1.1".winapi}".default = true;
@@ -1533,7 +1533,7 @@ rec {
       (crates."winapi"."${deps."isatty"."0.1.5"."winapi"}" deps)
     ]) else []);
   };
-  features_.isatty."0.1.5" = deps: f: updateFeatures f (rec {
+  features_.isatty."0.1.5" = deps: f: updateFeatures f ({
     isatty."0.1.5".default = (f.isatty."0.1.5".default or true);
     kernel32_sys."${deps.isatty."0.1.5".kernel32_sys}".default = true;
     libc."${deps.isatty."0.1.5".libc}".default = true;
@@ -1558,7 +1558,7 @@ rec {
       (crates."either"."${deps."itertools"."0.6.5"."either"}" deps)
     ]);
   };
-  features_.itertools."0.6.5" = deps: f: updateFeatures f (rec {
+  features_.itertools."0.6.5" = deps: f: updateFeatures f ({
     either."${deps.itertools."0.6.5".either}".default = (f.either."${deps.itertools."0.6.5".either}".default or false);
     itertools."0.6.5".default = (f.itertools."0.6.5".default or true);
   }) [
@@ -1577,7 +1577,7 @@ rec {
     sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
     features = mkFeatures (features."itoa"."0.3.4" or {});
   };
-  features_.itoa."0.3.4" = deps: f: updateFeatures f (rec {
+  features_.itoa."0.3.4" = deps: f: updateFeatures f ({
     itoa."0.3.4".default = (f.itoa."0.3.4".default or true);
   }) [];
 
@@ -1623,7 +1623,7 @@ rec {
       (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
     ]);
   };
-  features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec {
+  features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({
     kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true);
     winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true;
     winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true;
@@ -1765,7 +1765,7 @@ rec {
       (crates."crc32fast"."${deps."libflate"."0.1.19"."crc32fast"}" deps)
     ]);
   };
-  features_.libflate."0.1.19" = deps: f: updateFeatures f (rec {
+  features_.libflate."0.1.19" = deps: f: updateFeatures f ({
     adler32."${deps.libflate."0.1.19".adler32}".default = true;
     byteorder."${deps.libflate."0.1.19".byteorder}".default = true;
     crc32fast."${deps.libflate."0.1.19".crc32fast}".default = true;
@@ -1792,7 +1792,7 @@ rec {
       ++ (if features.lock_api."0.1.5".owning_ref or false then [ (crates.owning_ref."${deps."lock_api"."0.1.5".owning_ref}" deps) ] else []));
     features = mkFeatures (features."lock_api"."0.1.5" or {});
   };
-  features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec {
+  features_.lock_api."0.1.5" = deps: f: updateFeatures f ({
     lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true);
     owning_ref."${deps.lock_api."0.1.5".owning_ref}".default = true;
     scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false);
@@ -1838,7 +1838,7 @@ rec {
     ]);
     features = mkFeatures (features."log"."0.4.6" or {});
   };
-  features_.log."0.4.6" = deps: f: updateFeatures f (rec {
+  features_.log."0.4.6" = deps: f: updateFeatures f ({
     cfg_if."${deps.log."0.4.6".cfg_if}".default = true;
     log."0.4.6".default = (f.log."0.4.6".default or true);
   }) [
@@ -1856,7 +1856,7 @@ rec {
     authors = [ "bluss" ];
     sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h";
   };
-  features_.maplit."0.1.6" = deps: f: updateFeatures f (rec {
+  features_.maplit."0.1.6" = deps: f: updateFeatures f ({
     maplit."0.1.6".default = (f.maplit."0.1.6".default or true);
   }) [];
 
@@ -1872,7 +1872,7 @@ rec {
     sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan";
     libPath = "lib.rs";
   };
-  features_.matches."0.1.6" = deps: f: updateFeatures f (rec {
+  features_.matches."0.1.6" = deps: f: updateFeatures f ({
     matches."0.1.6".default = (f.matches."0.1.6".default or true);
   }) [];
 
@@ -1890,7 +1890,7 @@ rec {
       (crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps)
     ]);
   };
-  features_.memchr."0.1.11" = deps: f: updateFeatures f (rec {
+  features_.memchr."0.1.11" = deps: f: updateFeatures f ({
     libc."${deps.memchr."0.1.11".libc}".default = true;
     memchr."0.1.11".default = (f.memchr."0.1.11".default or true);
   }) [
@@ -1908,7 +1908,7 @@ rec {
     authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ];
     sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf";
   };
-  features_.memoffset."0.2.1" = deps: f: updateFeatures f (rec {
+  features_.memoffset."0.2.1" = deps: f: updateFeatures f ({
     memoffset."0.2.1".default = (f.memoffset."0.2.1".default or true);
   }) [];
 
@@ -1926,7 +1926,7 @@ rec {
       (crates."unicase"."${deps."mime"."0.3.12"."unicase"}" deps)
     ]);
   };
-  features_.mime."0.3.12" = deps: f: updateFeatures f (rec {
+  features_.mime."0.3.12" = deps: f: updateFeatures f ({
     mime."0.3.12".default = (f.mime."0.3.12".default or true);
     unicase."${deps.mime."0.3.12".unicase}".default = true;
   }) [
@@ -1955,7 +1955,7 @@ rec {
     ]);
     features = mkFeatures (features."mime_guess"."2.0.0-alpha.6" or {});
   };
-  features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f (rec {
+  features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f ({
     mime."${deps.mime_guess."2.0.0-alpha.6".mime}".default = true;
     mime_guess."2.0.0-alpha.6".default = (f.mime_guess."2.0.0-alpha.6".default or true);
     phf = fold recursiveUpdate {} [
@@ -1993,7 +1993,7 @@ rec {
       (crates."cc"."${deps."miniz_sys"."0.1.10"."cc"}" deps)
     ]);
   };
-  features_.miniz_sys."0.1.10" = deps: f: updateFeatures f (rec {
+  features_.miniz_sys."0.1.10" = deps: f: updateFeatures f ({
     cc."${deps.miniz_sys."0.1.10".cc}".default = true;
     libc."${deps.miniz_sys."0.1.10".libc}".default = true;
     miniz_sys."0.1.10".default = (f.miniz_sys."0.1.10".default or true);
@@ -2083,7 +2083,7 @@ rec {
       (crates."ws2_32_sys"."${deps."miow"."0.2.1"."ws2_32_sys"}" deps)
     ]);
   };
-  features_.miow."0.2.1" = deps: f: updateFeatures f (rec {
+  features_.miow."0.2.1" = deps: f: updateFeatures f ({
     kernel32_sys."${deps.miow."0.2.1".kernel32_sys}".default = true;
     miow."0.2.1".default = (f.miow."0.2.1".default or true);
     net2."${deps.miow."0.2.1".net2}".default = (f.net2."${deps.miow."0.2.1".net2}".default or false);
@@ -2126,7 +2126,7 @@ rec {
     ]) else []);
     features = mkFeatures (features."native_tls"."0.2.2" or {});
   };
-  features_.native_tls."0.2.2" = deps: f: updateFeatures f (rec {
+  features_.native_tls."0.2.2" = deps: f: updateFeatures f ({
     lazy_static."${deps.native_tls."0.2.2".lazy_static}".default = true;
     libc."${deps.native_tls."0.2.2".libc}".default = true;
     log."${deps.native_tls."0.2.2".log}".default = true;
@@ -2296,7 +2296,7 @@ rec {
       (crates."num_traits"."${deps."num_integer"."0.1.35"."num_traits"}" deps)
     ]);
   };
-  features_.num_integer."0.1.35" = deps: f: updateFeatures f (rec {
+  features_.num_integer."0.1.35" = deps: f: updateFeatures f ({
     num_integer."0.1.35".default = (f.num_integer."0.1.35".default or true);
     num_traits."${deps.num_integer."0.1.35".num_traits}".default = true;
   }) [
@@ -2318,7 +2318,7 @@ rec {
       (crates."num_traits"."${deps."num_iter"."0.1.34"."num_traits"}" deps)
     ]);
   };
-  features_.num_iter."0.1.34" = deps: f: updateFeatures f (rec {
+  features_.num_iter."0.1.34" = deps: f: updateFeatures f ({
     num_integer."${deps.num_iter."0.1.34".num_integer}".default = true;
     num_iter."0.1.34".default = (f.num_iter."0.1.34".default or true);
     num_traits."${deps.num_iter."0.1.34".num_traits}".default = true;
@@ -2338,7 +2338,7 @@ rec {
     authors = [ "The Rust Project Developers" ];
     sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw";
   };
-  features_.num_traits."0.1.40" = deps: f: updateFeatures f (rec {
+  features_.num_traits."0.1.40" = deps: f: updateFeatures f ({
     num_traits."0.1.40".default = (f.num_traits."0.1.40".default or true);
   }) [];
 
@@ -2356,7 +2356,7 @@ rec {
       (crates."libc"."${deps."num_cpus"."1.8.0"."libc"}" deps)
     ]);
   };
-  features_.num_cpus."1.8.0" = deps: f: updateFeatures f (rec {
+  features_.num_cpus."1.8.0" = deps: f: updateFeatures f ({
     libc."${deps.num_cpus."1.8.0".libc}".default = true;
     num_cpus."1.8.0".default = (f.num_cpus."1.8.0".default or true);
   }) [
@@ -2417,7 +2417,7 @@ rec {
     authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
     sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a";
   };
-  features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec {
+  features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({
     openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true);
   }) [];
 
@@ -2475,7 +2475,7 @@ rec {
       (crates."stable_deref_trait"."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps)
     ]);
   };
-  features_.owning_ref."0.4.0" = deps: f: updateFeatures f (rec {
+  features_.owning_ref."0.4.0" = deps: f: updateFeatures f ({
     owning_ref."0.4.0".default = (f.owning_ref."0.4.0".default or true);
     stable_deref_trait."${deps.owning_ref."0.4.0".stable_deref_trait}".default = true;
   }) [
@@ -2609,7 +2609,7 @@ rec {
     sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
     libPath = "lib.rs";
   };
-  features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec {
+  features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({
     percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true);
   }) [];
 
@@ -2661,7 +2661,7 @@ rec {
       (crates."phf_shared"."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps)
     ]);
   };
-  features_.phf_codegen."0.7.21" = deps: f: updateFeatures f (rec {
+  features_.phf_codegen."0.7.21" = deps: f: updateFeatures f ({
     phf_codegen."0.7.21".default = (f.phf_codegen."0.7.21".default or true);
     phf_generator."${deps.phf_codegen."0.7.21".phf_generator}".default = true;
     phf_shared."${deps.phf_codegen."0.7.21".phf_shared}".default = true;
@@ -2685,7 +2685,7 @@ rec {
       (crates."rand"."${deps."phf_generator"."0.7.21"."rand"}" deps)
     ]);
   };
-  features_.phf_generator."0.7.21" = deps: f: updateFeatures f (rec {
+  features_.phf_generator."0.7.21" = deps: f: updateFeatures f ({
     phf_generator."0.7.21".default = (f.phf_generator."0.7.21".default or true);
     phf_shared."${deps.phf_generator."0.7.21".phf_shared}".default = true;
     rand."${deps.phf_generator."0.7.21".rand}".default = true;
@@ -2711,7 +2711,7 @@ rec {
       ++ (if features.phf_shared."0.7.21".unicase or false then [ (crates.unicase."${deps."phf_shared"."0.7.21".unicase}" deps) ] else []));
     features = mkFeatures (features."phf_shared"."0.7.21" or {});
   };
-  features_.phf_shared."0.7.21" = deps: f: updateFeatures f (rec {
+  features_.phf_shared."0.7.21" = deps: f: updateFeatures f ({
     phf_shared."0.7.21".default = (f.phf_shared."0.7.21".default or true);
     siphasher."${deps.phf_shared."0.7.21".siphasher}".default = true;
     unicase."${deps.phf_shared."0.7.21".unicase}".default = true;
@@ -2731,7 +2731,7 @@ rec {
     authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
     sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
   };
-  features_.pkg_config."0.3.9" = deps: f: updateFeatures f (rec {
+  features_.pkg_config."0.3.9" = deps: f: updateFeatures f ({
     pkg_config."0.3.9".default = (f.pkg_config."0.3.9".default or true);
   }) [];
 
@@ -2746,7 +2746,7 @@ rec {
     authors = [ "David Tolnay <dtolnay@gmail.com>" ];
     sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
   };
-  features_.quote."0.3.15" = deps: f: updateFeatures f (rec {
+  features_.quote."0.3.15" = deps: f: updateFeatures f ({
     quote."0.3.15".default = (f.quote."0.3.15".default or true);
   }) [];
 
@@ -3036,7 +3036,7 @@ rec {
       (crates."rustc_version"."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps)
     ]);
   };
-  features_.rand_chacha."0.1.0" = deps: f: updateFeatures f (rec {
+  features_.rand_chacha."0.1.0" = deps: f: updateFeatures f ({
     rand_chacha."0.1.0".default = (f.rand_chacha."0.1.0".default or true);
     rand_core."${deps.rand_chacha."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.0".rand_core}".default or false);
     rustc_version."${deps.rand_chacha."0.1.0".rustc_version}".default = true;
@@ -3131,7 +3131,7 @@ rec {
       (crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps)
     ]);
   };
-  features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec {
+  features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({
     rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false);
     rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true);
   }) [
@@ -3259,7 +3259,7 @@ rec {
     sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4";
     libName = "syscall";
   };
-  features_.redox_syscall."0.1.31" = deps: f: updateFeatures f (rec {
+  features_.redox_syscall."0.1.31" = deps: f: updateFeatures f ({
     redox_syscall."0.1.31".default = (f.redox_syscall."0.1.31".default or true);
   }) [];
 
@@ -3278,7 +3278,7 @@ rec {
       (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
     ]);
   };
-  features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec {
+  features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({
     redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true;
     redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true);
   }) [
@@ -3336,7 +3336,7 @@ rec {
     authors = [ "The Rust Project Developers" ];
     sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
   };
-  features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec {
+  features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({
     regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true);
   }) [];
 
@@ -3354,7 +3354,7 @@ rec {
       (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
     ]) else []);
   };
-  features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec {
+  features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({
     remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true);
     winapi = fold recursiveUpdate {} [
       { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; }
@@ -3479,7 +3479,7 @@ rec {
       (crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps)
     ]);
   };
-  features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec {
+  features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({
     rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true);
     semver."${deps.rustc_version."0.2.3".semver}".default = true;
   }) [
@@ -3523,7 +3523,7 @@ rec {
       (crates."winapi"."${deps."schannel"."0.1.14"."winapi"}" deps)
     ]);
   };
-  features_.schannel."0.1.14" = deps: f: updateFeatures f (rec {
+  features_.schannel."0.1.14" = deps: f: updateFeatures f ({
     lazy_static."${deps.schannel."0.1.14".lazy_static}".default = true;
     schannel."0.1.14".default = (f.schannel."0.1.14".default or true);
     winapi = fold recursiveUpdate {} [
@@ -3706,7 +3706,7 @@ rec {
     authors = [ "Steve Klabnik <steve@steveklabnik.com>" ];
     sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
   };
-  features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec {
+  features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({
     semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true);
   }) [];
 
@@ -3798,7 +3798,7 @@ rec {
       (crates."url"."${deps."serde_urlencoded"."0.5.1"."url"}" deps)
     ]);
   };
-  features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f (rec {
+  features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f ({
     dtoa."${deps.serde_urlencoded."0.5.1".dtoa}".default = true;
     itoa."${deps.serde_urlencoded."0.5.1".itoa}".default = true;
     serde."${deps.serde_urlencoded."0.5.1".serde}".default = true;
@@ -3824,7 +3824,7 @@ rec {
     dependencies = mapFeatures features ([
 ]);
   };
-  features_.siphasher."0.2.2" = deps: f: updateFeatures f (rec {
+  features_.siphasher."0.2.2" = deps: f: updateFeatures f ({
     siphasher."0.2.2".default = (f.siphasher."0.2.2".default or true);
   }) [];
 
@@ -3839,7 +3839,7 @@ rec {
     authors = [ "Carl Lerche <me@carllerche.com>" ];
     sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0";
   };
-  features_.slab."0.4.0" = deps: f: updateFeatures f (rec {
+  features_.slab."0.4.0" = deps: f: updateFeatures f ({
     slab."0.4.0".default = (f.slab."0.4.0".default or true);
   }) [];
 
@@ -3884,7 +3884,7 @@ rec {
       (crates."slog_term"."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps)
     ]);
   };
-  features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f (rec {
+  features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f ({
     log."${deps.slog_envlogger."0.5.0".log}".default = true;
     regex."${deps.slog_envlogger."0.5.0".regex}".default = true;
     slog."${deps.slog_envlogger."0.5.0".slog}".default = true;
@@ -3915,7 +3915,7 @@ rec {
       (crates."thread_local"."${deps."slog_extra"."0.1.2"."thread_local"}" deps)
     ]);
   };
-  features_.slog_extra."0.1.2" = deps: f: updateFeatures f (rec {
+  features_.slog_extra."0.1.2" = deps: f: updateFeatures f ({
     slog."${deps.slog_extra."0.1.2".slog}".default = true;
     slog_extra."0.1.2".default = (f.slog_extra."0.1.2".default or true);
     thread_local."${deps.slog_extra."0.1.2".thread_local}".default = true;
@@ -3943,7 +3943,7 @@ rec {
       (crates."slog_term"."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps)
     ]);
   };
-  features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f (rec {
+  features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f ({
     crossbeam."${deps.slog_stdlog."1.1.0".crossbeam}".default = true;
     lazy_static."${deps.slog_stdlog."1.1.0".lazy_static}".default = true;
     log."${deps.slog_stdlog."1.1.0".log}".default = true;
@@ -3975,7 +3975,7 @@ rec {
       (crates."thread_local"."${deps."slog_stream"."1.2.1"."thread_local"}" deps)
     ]);
   };
-  features_.slog_stream."1.2.1" = deps: f: updateFeatures f (rec {
+  features_.slog_stream."1.2.1" = deps: f: updateFeatures f ({
     slog."${deps.slog_stream."1.2.1".slog}".default = true;
     slog_extra."${deps.slog_stream."1.2.1".slog_extra}".default = true;
     slog_stream."1.2.1".default = (f.slog_stream."1.2.1".default or true);
@@ -4005,7 +4005,7 @@ rec {
       (crates."thread_local"."${deps."slog_term"."1.5.0"."thread_local"}" deps)
     ]);
   };
-  features_.slog_term."1.5.0" = deps: f: updateFeatures f (rec {
+  features_.slog_term."1.5.0" = deps: f: updateFeatures f ({
     chrono."${deps.slog_term."1.5.0".chrono}".default = true;
     isatty."${deps.slog_term."1.5.0".isatty}".default = true;
     slog."${deps.slog_term."1.5.0".slog}".default = true;
@@ -4082,7 +4082,7 @@ rec {
     authors = [ "Carl Lerche <me@carllerche.com>" ];
     sha256 = "1120qvf02aydqj0k3kpr8d7zybq0y5arnmgmfsdw75r8qwz75wc6";
   };
-  features_.string."0.1.2" = deps: f: updateFeatures f (rec {
+  features_.string."0.1.2" = deps: f: updateFeatures f ({
     string."0.1.2".default = (f.string."0.1.2".default or true);
   }) [];
 
@@ -4097,7 +4097,7 @@ rec {
     authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
     sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
   };
-  features_.strsim."0.6.0" = deps: f: updateFeatures f (rec {
+  features_.strsim."0.6.0" = deps: f: updateFeatures f ({
     strsim."0.6.0".default = (f.strsim."0.6.0".default or true);
   }) [];
 
@@ -4165,7 +4165,7 @@ rec {
       (crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps)
     ]);
   };
-  features_.synom."0.11.3" = deps: f: updateFeatures f (rec {
+  features_.synom."0.11.3" = deps: f: updateFeatures f ({
     synom."0.11.3".default = (f.synom."0.11.3".default or true);
     unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true;
   }) [
@@ -4233,7 +4233,7 @@ rec {
       (crates."winapi"."${deps."tempfile"."3.0.5"."winapi"}" deps)
     ]) else []);
   };
-  features_.tempfile."3.0.5" = deps: f: updateFeatures f (rec {
+  features_.tempfile."3.0.5" = deps: f: updateFeatures f ({
     cfg_if."${deps.tempfile."3.0.5".cfg_if}".default = true;
     libc."${deps.tempfile."3.0.5".libc}".default = true;
     rand."${deps.tempfile."3.0.5".rand}".default = true;
@@ -4273,7 +4273,7 @@ rec {
       (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps)
     ]) else []);
   };
-  features_.termion."1.5.1" = deps: f: updateFeatures f (rec {
+  features_.termion."1.5.1" = deps: f: updateFeatures f ({
     libc."${deps.termion."1.5.1".libc}".default = true;
     redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true;
     redox_termios."${deps.termion."1.5.1".redox_termios}".default = true;
@@ -4298,7 +4298,7 @@ rec {
       (crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps)
     ]);
   };
-  features_.textwrap."0.9.0" = deps: f: updateFeatures f (rec {
+  features_.textwrap."0.9.0" = deps: f: updateFeatures f ({
     textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true);
     unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true;
   }) [
@@ -4320,7 +4320,7 @@ rec {
       (crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps)
     ]);
   };
-  features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec {
+  features_.thread_id."2.0.0" = deps: f: updateFeatures f ({
     kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true;
     libc."${deps.thread_id."2.0.0".libc}".default = true;
     thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true);
@@ -4343,7 +4343,7 @@ rec {
       (crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps)
     ]);
   };
-  features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec {
+  features_.thread_local."0.2.7" = deps: f: updateFeatures f ({
     thread_id."${deps.thread_local."0.2.7".thread_id}".default = true;
     thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true);
   }) [
@@ -4365,7 +4365,7 @@ rec {
       (crates."unreachable"."${deps."thread_local"."0.3.4"."unreachable"}" deps)
     ]);
   };
-  features_.thread_local."0.3.4" = deps: f: updateFeatures f (rec {
+  features_.thread_local."0.3.4" = deps: f: updateFeatures f ({
     lazy_static."${deps.thread_local."0.3.4".lazy_static}".default = true;
     thread_local."0.3.4".default = (f.thread_local."0.3.4".default or true);
     unreachable."${deps.thread_local."0.3.4".unreachable}".default = true;
@@ -4395,7 +4395,7 @@ rec {
       (crates."winapi"."${deps."time"."0.1.38"."winapi"}" deps)
     ]) else []);
   };
-  features_.time."0.1.38" = deps: f: updateFeatures f (rec {
+  features_.time."0.1.38" = deps: f: updateFeatures f ({
     kernel32_sys."${deps.time."0.1.38".kernel32_sys}".default = true;
     libc."${deps.time."0.1.38".libc}".default = true;
     redox_syscall."${deps.time."0.1.38".redox_syscall}".default = true;
@@ -4431,7 +4431,7 @@ rec {
       (crates."tokio_udp"."${deps."tokio"."0.1.7"."tokio_udp"}" deps)
     ]);
   };
-  features_.tokio."0.1.7" = deps: f: updateFeatures f (rec {
+  features_.tokio."0.1.7" = deps: f: updateFeatures f ({
     futures."${deps.tokio."0.1.7".futures}".default = true;
     mio."${deps.tokio."0.1.7".mio}".default = true;
     tokio."0.1.7".default = (f.tokio."0.1.7".default or true);
@@ -4472,7 +4472,7 @@ rec {
       (crates."tokio_io"."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps)
     ]);
   };
-  features_.tokio_codec."0.1.1" = deps: f: updateFeatures f (rec {
+  features_.tokio_codec."0.1.1" = deps: f: updateFeatures f ({
     bytes."${deps.tokio_codec."0.1.1".bytes}".default = true;
     futures."${deps.tokio_codec."0.1.1".futures}".default = true;
     tokio_codec."0.1.1".default = (f.tokio_codec."0.1.1".default or true);
@@ -4497,7 +4497,7 @@ rec {
       (crates."futures"."${deps."tokio_executor"."0.1.5"."futures"}" deps)
     ]);
   };
-  features_.tokio_executor."0.1.5" = deps: f: updateFeatures f (rec {
+  features_.tokio_executor."0.1.5" = deps: f: updateFeatures f ({
     futures."${deps.tokio_executor."0.1.5".futures}".default = true;
     tokio_executor."0.1.5".default = (f.tokio_executor."0.1.5".default or true);
   }) [
@@ -4520,7 +4520,7 @@ rec {
       (crates."tokio_threadpool"."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps)
     ]);
   };
-  features_.tokio_fs."0.1.4" = deps: f: updateFeatures f (rec {
+  features_.tokio_fs."0.1.4" = deps: f: updateFeatures f ({
     futures."${deps.tokio_fs."0.1.4".futures}".default = true;
     tokio_fs."0.1.4".default = (f.tokio_fs."0.1.4".default or true);
     tokio_io."${deps.tokio_fs."0.1.4".tokio_io}".default = true;
@@ -4547,7 +4547,7 @@ rec {
       (crates."log"."${deps."tokio_io"."0.1.10"."log"}" deps)
     ]);
   };
-  features_.tokio_io."0.1.10" = deps: f: updateFeatures f (rec {
+  features_.tokio_io."0.1.10" = deps: f: updateFeatures f ({
     bytes."${deps.tokio_io."0.1.10".bytes}".default = true;
     futures."${deps.tokio_io."0.1.10".futures}".default = true;
     log."${deps.tokio_io."0.1.10".log}".default = true;
@@ -4581,7 +4581,7 @@ rec {
       (crates."tokio_io"."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps)
     ]);
   };
-  features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f (rec {
+  features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f ({
     crossbeam_utils."${deps.tokio_reactor."0.1.7".crossbeam_utils}".default = true;
     futures."${deps.tokio_reactor."0.1.7".futures}".default = true;
     lazy_static."${deps.tokio_reactor."0.1.7".lazy_static}".default = true;
@@ -4625,7 +4625,7 @@ rec {
       (crates."tokio_reactor"."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps)
     ]);
   };
-  features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f (rec {
+  features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f ({
     bytes."${deps.tokio_tcp."0.1.2".bytes}".default = true;
     futures."${deps.tokio_tcp."0.1.2".futures}".default = true;
     iovec."${deps.tokio_tcp."0.1.2".iovec}".default = true;
@@ -4662,7 +4662,7 @@ rec {
       (crates."tokio_executor"."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps)
     ]);
   };
-  features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f (rec {
+  features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f ({
     crossbeam_deque."${deps.tokio_threadpool."0.1.9".crossbeam_deque}".default = true;
     crossbeam_utils."${deps.tokio_threadpool."0.1.9".crossbeam_utils}".default = true;
     futures."${deps.tokio_threadpool."0.1.9".futures}".default = true;
@@ -4696,7 +4696,7 @@ rec {
       (crates."tokio_executor"."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps)
     ]);
   };
-  features_.tokio_timer."0.2.5" = deps: f: updateFeatures f (rec {
+  features_.tokio_timer."0.2.5" = deps: f: updateFeatures f ({
     futures."${deps.tokio_timer."0.2.5".futures}".default = true;
     tokio_executor."${deps.tokio_timer."0.2.5".tokio_executor}".default = true;
     tokio_timer."0.2.5".default = (f.tokio_timer."0.2.5".default or true);
@@ -4725,7 +4725,7 @@ rec {
       (crates."tokio_reactor"."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps)
     ]);
   };
-  features_.tokio_udp."0.1.3" = deps: f: updateFeatures f (rec {
+  features_.tokio_udp."0.1.3" = deps: f: updateFeatures f ({
     bytes."${deps.tokio_udp."0.1.3".bytes}".default = true;
     futures."${deps.tokio_udp."0.1.3".futures}".default = true;
     log."${deps.tokio_udp."0.1.3".log}".default = true;
@@ -4755,7 +4755,7 @@ rec {
     authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
     sha256 = "1k8xc0jpbrmzp0fwghdh6pwzjb9xx2p8yy0xxnnb8065smc5fsrv";
   };
-  features_.try_lock."0.2.2" = deps: f: updateFeatures f (rec {
+  features_.try_lock."0.2.2" = deps: f: updateFeatures f ({
     try_lock."0.2.2".default = (f.try_lock."0.2.2".default or true);
   }) [];
 
@@ -4812,7 +4812,7 @@ rec {
     ]);
     features = mkFeatures (features."unicase"."2.1.0" or {});
   };
-  features_.unicase."2.1.0" = deps: f: updateFeatures f (rec {
+  features_.unicase."2.1.0" = deps: f: updateFeatures f ({
     unicase."2.1.0".default = (f.unicase."2.1.0".default or true);
     version_check."${deps.unicase."2.1.0".version_check}".default = true;
   }) [
@@ -4867,7 +4867,7 @@ rec {
     authors = [ "kwantam <kwantam@gmail.com>" ];
     sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5";
   };
-  features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f (rec {
+  features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f ({
     unicode_normalization."0.1.5".default = (f.unicode_normalization."0.1.5".default or true);
   }) [];
 
@@ -4883,7 +4883,7 @@ rec {
     sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
     features = mkFeatures (features."unicode_width"."0.1.4" or {});
   };
-  features_.unicode_width."0.1.4" = deps: f: updateFeatures f (rec {
+  features_.unicode_width."0.1.4" = deps: f: updateFeatures f ({
     unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true);
   }) [];
 
@@ -4899,7 +4899,7 @@ rec {
     sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
     features = mkFeatures (features."unicode_xid"."0.0.4" or {});
   };
-  features_.unicode_xid."0.0.4" = deps: f: updateFeatures f (rec {
+  features_.unicode_xid."0.0.4" = deps: f: updateFeatures f ({
     unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true);
   }) [];
 
@@ -4917,7 +4917,7 @@ rec {
       (crates."void"."${deps."unreachable"."1.0.0"."void"}" deps)
     ]);
   };
-  features_.unreachable."1.0.0" = deps: f: updateFeatures f (rec {
+  features_.unreachable."1.0.0" = deps: f: updateFeatures f ({
     unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true);
     void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false);
   }) [
@@ -4973,7 +4973,7 @@ rec {
     authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
     sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
   };
-  features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec {
+  features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({
     utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true);
   }) [];
 
@@ -5040,7 +5040,7 @@ rec {
     authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
     sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a";
   };
-  features_.vcpkg."0.2.2" = deps: f: updateFeatures f (rec {
+  features_.vcpkg."0.2.2" = deps: f: updateFeatures f ({
     vcpkg."0.2.2".default = (f.vcpkg."0.2.2".default or true);
   }) [];
 
@@ -5083,7 +5083,7 @@ rec {
     authors = [ "Sergio Benitez <sb@sergio.bz>" ];
     sha256 = "0z635wdclv9bvafj11fpgndn7y79ibpsnc364pm61i1m4wwg8msg";
   };
-  features_.version_check."0.1.3" = deps: f: updateFeatures f (rec {
+  features_.version_check."0.1.3" = deps: f: updateFeatures f ({
     version_check."0.1.3".default = (f.version_check."0.1.3".default or true);
   }) [];
 
@@ -5125,7 +5125,7 @@ rec {
       (crates."try_lock"."${deps."want"."0.0.6"."try_lock"}" deps)
     ]);
   };
-  features_.want."0.0.6" = deps: f: updateFeatures f (rec {
+  features_.want."0.0.6" = deps: f: updateFeatures f ({
     futures."${deps.want."0.0.6".futures}".default = true;
     log."${deps.want."0.0.6".log}".default = true;
     try_lock."${deps.want."0.0.6".try_lock}".default = true;
@@ -5147,7 +5147,7 @@ rec {
     authors = [ "Peter Atashian <retep998@gmail.com>" ];
     sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
   };
-  features_.winapi."0.2.8" = deps: f: updateFeatures f (rec {
+  features_.winapi."0.2.8" = deps: f: updateFeatures f ({
     winapi."0.2.8".default = (f.winapi."0.2.8".default or true);
   }) [];
 
@@ -5170,7 +5170,7 @@ rec {
     ]) else []);
     features = mkFeatures (features."winapi"."0.3.6" or {});
   };
-  features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+  features_.winapi."0.3.6" = deps: f: updateFeatures f ({
     winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
     winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
     winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
@@ -5191,7 +5191,7 @@ rec {
     sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
     libName = "build";
   };
-  features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec {
+  features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({
     winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true);
   }) [];
 
@@ -5207,7 +5207,7 @@ rec {
     sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
     build = "build.rs";
   };
-  features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+  features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
     winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
   }) [];
 
@@ -5223,7 +5223,7 @@ rec {
     sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
     build = "build.rs";
   };
-  features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+  features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
     winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
   }) [];
 
@@ -5247,7 +5247,7 @@ rec {
       (crates."winapi_build"."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps)
     ]);
   };
-  features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f (rec {
+  features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f ({
     winapi."${deps.ws2_32_sys."0.2.1".winapi}".default = true;
     winapi_build."${deps.ws2_32_sys."0.2.1".winapi_build}".default = true;
     ws2_32_sys."0.2.1".default = (f.ws2_32_sys."0.2.1".default or true);
diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/pkgs/tools/package-management/cargo-update/cargo-update.nix
index 1bd8aadf498..9b8cf24605a 100644
--- a/pkgs/tools/package-management/cargo-update/cargo-update.nix
+++ b/pkgs/tools/package-management/cargo-update/cargo-update.nix
@@ -520,7 +520,7 @@ rec {
     dependencies = mapFeatures features ([ winapi_0_2_8 ]);
     buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
   };
-  advapi32_sys_0_2_0_features = f: updateFeatures f (rec {
+  advapi32_sys_0_2_0_features = f: updateFeatures f ({
     advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true);
     winapi_0_2_8.default = true;
     winapi_build_0_1_1.default = true;
@@ -528,14 +528,14 @@ rec {
   aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ {
     dependencies = mapFeatures features ([ memchr_2_0_1 ]);
   };
-  aho_corasick_0_6_4_features = f: updateFeatures f (rec {
+  aho_corasick_0_6_4_features = f: updateFeatures f ({
     aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true);
     memchr_2_0_1.default = true;
   }) [ memchr_2_0_1_features ];
   ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
     dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
   };
-  ansi_term_0_11_0_features = f: updateFeatures f (rec {
+  ansi_term_0_11_0_features = f: updateFeatures f ({
     ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
     winapi_0_3_4.consoleapi = true;
     winapi_0_3_4.default = true;
@@ -543,7 +543,7 @@ rec {
     winapi_0_3_4.processenv = true;
   }) [ winapi_0_3_4_features ];
   array_tool_1_0_3 = { features?(array_tool_1_0_3_features {}) }: array_tool_1_0_3_ {};
-  array_tool_1_0_3_features = f: updateFeatures f (rec {
+  array_tool_1_0_3_features = f: updateFeatures f ({
     array_tool_1_0_3.default = (f.array_tool_1_0_3.default or true);
   }) [];
   atty_0_2_10 = { features?(atty_0_2_10_features {}) }: atty_0_2_10_ {
@@ -551,7 +551,7 @@ rec {
       ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
       ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
   };
-  atty_0_2_10_features = f: updateFeatures f (rec {
+  atty_0_2_10_features = f: updateFeatures f ({
     atty_0_2_10.default = (f.atty_0_2_10.default or true);
     libc_0_2_40.default = (f.libc_0_2_40.default or false);
     termion_1_5_1.default = true;
@@ -575,14 +575,14 @@ rec {
   bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ {
     features = mkFeatures (features.bitflags_1_0_3 or {});
   };
-  bitflags_1_0_3_features = f: updateFeatures f (rec {
+  bitflags_1_0_3_features = f: updateFeatures f ({
     bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true);
   }) [];
   cargo_update_1_5_2 = { features?(cargo_update_1_5_2_features {}) }: cargo_update_1_5_2_ {
     dependencies = mapFeatures features ([ array_tool_1_0_3 clap_2_31_2 git2_0_6_11 json_0_11_13 lazy_static_1_0_0 lazysort_0_2_0 regex_0_2_11 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 tabwriter_1_0_4 toml_0_4_6 url_1_7_0 ]);
     buildDependencies = mapFeatures features ([ embed_resource_1_1_4 ]);
   };
-  cargo_update_1_5_2_features = f: updateFeatures f (rec {
+  cargo_update_1_5_2_features = f: updateFeatures f ({
     array_tool_1_0_3.default = true;
     cargo_update_1_5_2.default = (f.cargo_update_1_5_2.default or true);
     clap_2_31_2.default = true;
@@ -677,7 +677,7 @@ rec {
   cmake_0_1_31 = { features?(cmake_0_1_31_features {}) }: cmake_0_1_31_ {
     dependencies = mapFeatures features ([ cc_1_0_15 ]);
   };
-  cmake_0_1_31_features = f: updateFeatures f (rec {
+  cmake_0_1_31_features = f: updateFeatures f ({
     cc_1_0_15.default = true;
     cmake_0_1_31.default = (f.cmake_0_1_31.default or true);
   }) [ cc_1_0_15_features ];
@@ -688,7 +688,7 @@ rec {
       ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
     buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
   };
-  curl_sys_0_4_5_features = f: updateFeatures f (rec {
+  curl_sys_0_4_5_features = f: updateFeatures f ({
     cc_1_0_15.default = true;
     curl_sys_0_4_5.default = (f.curl_sys_0_4_5.default or true);
     libc_0_2_40.default = true;
@@ -702,20 +702,20 @@ rec {
   embed_resource_1_1_4 = { features?(embed_resource_1_1_4_features {}) }: embed_resource_1_1_4_ {
     dependencies = (if kernel == "windows" && abi == "msvc" then mapFeatures features ([ winreg_0_4_0 ]) else []);
   };
-  embed_resource_1_1_4_features = f: updateFeatures f (rec {
+  embed_resource_1_1_4_features = f: updateFeatures f ({
     embed_resource_1_1_4.default = (f.embed_resource_1_1_4.default or true);
     winreg_0_4_0.default = (f.winreg_0_4_0.default or false);
   }) [ winreg_0_4_0_features ];
   fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
     dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]);
   };
-  fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
+  fuchsia_zircon_0_3_3_features = f: updateFeatures f ({
     bitflags_1_0_3.default = true;
     fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
     fuchsia_zircon_sys_0_3_3.default = true;
   }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ];
   fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
-  fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
+  fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f ({
     fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
   }) [];
   git2_0_6_11 = { features?(git2_0_6_11_features {}) }: git2_0_6_11_ {
@@ -769,21 +769,21 @@ rec {
   idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ {
     dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]);
   };
-  idna_0_1_4_features = f: updateFeatures f (rec {
+  idna_0_1_4_features = f: updateFeatures f ({
     idna_0_1_4.default = (f.idna_0_1_4.default or true);
     matches_0_1_6.default = true;
     unicode_bidi_0_3_4.default = true;
     unicode_normalization_0_1_7.default = true;
   }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ];
   json_0_11_13 = { features?(json_0_11_13_features {}) }: json_0_11_13_ {};
-  json_0_11_13_features = f: updateFeatures f (rec {
+  json_0_11_13_features = f: updateFeatures f ({
     json_0_11_13.default = (f.json_0_11_13.default or true);
   }) [];
   kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
     dependencies = mapFeatures features ([ winapi_0_2_8 ]);
     buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
   };
-  kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+  kernel32_sys_0_2_2_features = f: updateFeatures f ({
     kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
     winapi_0_2_8.default = true;
     winapi_build_0_1_1.default = true;
@@ -811,7 +811,7 @@ rec {
     dependencies = mapFeatures features ([ rand_0_3_22 ]);
     features = mkFeatures (features.lazysort_0_2_0 or {});
   };
-  lazysort_0_2_0_features = f: updateFeatures f (rec {
+  lazysort_0_2_0_features = f: updateFeatures f ({
     lazysort_0_2_0.default = (f.lazysort_0_2_0.default or true);
     rand_0_3_22.default = true;
   }) [ rand_0_3_22_features ];
@@ -863,7 +863,7 @@ rec {
       ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []);
     buildDependencies = mapFeatures features ([ cmake_0_1_31 pkg_config_0_3_11 ]);
   };
-  libssh2_sys_0_2_7_features = f: updateFeatures f (rec {
+  libssh2_sys_0_2_7_features = f: updateFeatures f ({
     cmake_0_1_31.default = true;
     libc_0_2_40.default = true;
     libssh2_sys_0_2_7.default = (f.libssh2_sys_0_2_7.default or true);
@@ -876,14 +876,14 @@ rec {
       ++ (if abi == "msvc" then mapFeatures features ([]) else []);
     buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
   };
-  libz_sys_1_0_18_features = f: updateFeatures f (rec {
+  libz_sys_1_0_18_features = f: updateFeatures f ({
     cc_1_0_15.default = true;
     libc_0_2_40.default = true;
     libz_sys_1_0_18.default = (f.libz_sys_1_0_18.default or true);
     pkg_config_0_3_11.default = true;
   }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ];
   matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {};
-  matches_0_1_6_features = f: updateFeatures f (rec {
+  matches_0_1_6_features = f: updateFeatures f ({
     matches_0_1_6.default = (f.matches_0_1_6.default or true);
   }) [];
   memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
@@ -910,7 +910,7 @@ rec {
       (memchr_2_0_1.default or false);
   }) [ libc_0_2_40_features ];
   openssl_probe_0_1_2 = { features?(openssl_probe_0_1_2_features {}) }: openssl_probe_0_1_2_ {};
-  openssl_probe_0_1_2_features = f: updateFeatures f (rec {
+  openssl_probe_0_1_2_features = f: updateFeatures f ({
     openssl_probe_0_1_2.default = (f.openssl_probe_0_1_2.default or true);
   }) [];
   openssl_sys_0_9_30 = { features?(openssl_sys_0_9_30_features {}) }: openssl_sys_0_9_30_ {
@@ -918,18 +918,18 @@ rec {
       ++ (if abi == "msvc" then mapFeatures features ([]) else []);
     buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
   };
-  openssl_sys_0_9_30_features = f: updateFeatures f (rec {
+  openssl_sys_0_9_30_features = f: updateFeatures f ({
     cc_1_0_15.default = true;
     libc_0_2_40.default = true;
     openssl_sys_0_9_30.default = (f.openssl_sys_0_9_30.default or true);
     pkg_config_0_3_11.default = true;
   }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ];
   percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {};
-  percent_encoding_1_0_1_features = f: updateFeatures f (rec {
+  percent_encoding_1_0_1_features = f: updateFeatures f ({
     percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true);
   }) [];
   pkg_config_0_3_11 = { features?(pkg_config_0_3_11_features {}) }: pkg_config_0_3_11_ {};
-  pkg_config_0_3_11_features = f: updateFeatures f (rec {
+  pkg_config_0_3_11_features = f: updateFeatures f ({
     pkg_config_0_3_11.default = (f.pkg_config_0_3_11.default or true);
   }) [];
   proc_macro2_0_3_8 = { features?(proc_macro2_0_3_8_features {}) }: proc_macro2_0_3_8_ {
@@ -1007,13 +1007,13 @@ rec {
     winapi_0_3_4.winnt = true;
   }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ];
   redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {};
-  redox_syscall_0_1_37_features = f: updateFeatures f (rec {
+  redox_syscall_0_1_37_features = f: updateFeatures f ({
     redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true);
   }) [];
   redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
     dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]);
   };
-  redox_termios_0_1_1_features = f: updateFeatures f (rec {
+  redox_termios_0_1_1_features = f: updateFeatures f ({
     redox_syscall_0_1_37.default = true;
     redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
   }) [ redox_syscall_0_1_37_features ];
@@ -1036,7 +1036,7 @@ rec {
   regex_syntax_0_5_6 = { features?(regex_syntax_0_5_6_features {}) }: regex_syntax_0_5_6_ {
     dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
   };
-  regex_syntax_0_5_6_features = f: updateFeatures f (rec {
+  regex_syntax_0_5_6_features = f: updateFeatures f ({
     regex_syntax_0_5_6.default = (f.regex_syntax_0_5_6.default or true);
     ucd_util_0_1_1.default = true;
   }) [ ucd_util_0_1_1_features ];
@@ -1055,7 +1055,7 @@ rec {
     serde_1_0_55.default = true;
   }) [ semver_parser_0_7_0_features serde_1_0_55_features ];
   semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
-  semver_parser_0_7_0_features = f: updateFeatures f (rec {
+  semver_parser_0_7_0_features = f: updateFeatures f ({
     semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
   }) [];
   serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ {
@@ -1081,7 +1081,7 @@ rec {
     dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]);
     features = mkFeatures (features.serde_derive_1_0_55 or {});
   };
-  serde_derive_1_0_55_features = f: updateFeatures f (rec {
+  serde_derive_1_0_55_features = f: updateFeatures f ({
     proc_macro2_0_3_8.default = true;
     quote_0_5_2.default = true;
     serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true);
@@ -1089,7 +1089,7 @@ rec {
     syn_0_13_10.visit = true;
   }) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ];
   strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
-  strsim_0_7_0_features = f: updateFeatures f (rec {
+  strsim_0_7_0_features = f: updateFeatures f ({
     strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
   }) [];
   syn_0_13_10 = { features?(syn_0_13_10_features {}) }: syn_0_13_10_ {
@@ -1155,7 +1155,7 @@ rec {
     dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else [])
       ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []);
   };
-  termion_1_5_1_features = f: updateFeatures f (rec {
+  termion_1_5_1_features = f: updateFeatures f ({
     libc_0_2_40.default = true;
     redox_syscall_0_1_37.default = true;
     redox_termios_0_1_1.default = true;
@@ -1164,14 +1164,14 @@ rec {
   textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ {
     dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
   };
-  textwrap_0_9_0_features = f: updateFeatures f (rec {
+  textwrap_0_9_0_features = f: updateFeatures f ({
     textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true);
     unicode_width_0_1_4.default = true;
   }) [ unicode_width_0_1_4_features ];
   thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ {
     dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]);
   };
-  thread_local_0_3_5_features = f: updateFeatures f (rec {
+  thread_local_0_3_5_features = f: updateFeatures f ({
     lazy_static_1_0_0.default = true;
     thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true);
     unreachable_1_0_0.default = true;
@@ -1179,12 +1179,12 @@ rec {
   toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ {
     dependencies = mapFeatures features ([ serde_1_0_55 ]);
   };
-  toml_0_4_6_features = f: updateFeatures f (rec {
+  toml_0_4_6_features = f: updateFeatures f ({
     serde_1_0_55.default = true;
     toml_0_4_6.default = (f.toml_0_4_6.default or true);
   }) [ serde_1_0_55_features ];
   ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
-  ucd_util_0_1_1_features = f: updateFeatures f (rec {
+  ucd_util_0_1_1_features = f: updateFeatures f ({
     ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
   }) [];
   unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
@@ -1208,25 +1208,25 @@ rec {
       (unicode_bidi_0_3_4.with_serde or false);
   }) [ matches_0_1_6_features ];
   unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {};
-  unicode_normalization_0_1_7_features = f: updateFeatures f (rec {
+  unicode_normalization_0_1_7_features = f: updateFeatures f ({
     unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true);
   }) [];
   unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
     features = mkFeatures (features.unicode_width_0_1_4 or {});
   };
-  unicode_width_0_1_4_features = f: updateFeatures f (rec {
+  unicode_width_0_1_4_features = f: updateFeatures f ({
     unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
   }) [];
   unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
     features = mkFeatures (features.unicode_xid_0_1_0 or {});
   };
-  unicode_xid_0_1_0_features = f: updateFeatures f (rec {
+  unicode_xid_0_1_0_features = f: updateFeatures f ({
     unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
   }) [];
   unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
     dependencies = mapFeatures features ([ void_1_0_2 ]);
   };
-  unreachable_1_0_0_features = f: updateFeatures f (rec {
+  unreachable_1_0_0_features = f: updateFeatures f ({
     unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
     void_1_0_2.default = (f.void_1_0_2.default or false);
   }) [ void_1_0_2_features ];
@@ -1249,11 +1249,11 @@ rec {
       (url_1_7_0.heap_size or false);
   }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ];
   utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
-  utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
+  utf8_ranges_1_0_0_features = f: updateFeatures f ({
     utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
   }) [];
   vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {};
-  vcpkg_0_2_3_features = f: updateFeatures f (rec {
+  vcpkg_0_2_3_features = f: updateFeatures f ({
     vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true);
   }) [];
   vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ {
@@ -1278,7 +1278,7 @@ rec {
       (void_1_0_2.default or false);
   }) [];
   winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
-  winapi_0_2_8_features = f: updateFeatures f (rec {
+  winapi_0_2_8_features = f: updateFeatures f ({
     winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
   }) [];
   winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ {
@@ -1286,21 +1286,21 @@ rec {
       ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
     features = mkFeatures (features.winapi_0_3_4 or {});
   };
-  winapi_0_3_4_features = f: updateFeatures f (rec {
+  winapi_0_3_4_features = f: updateFeatures f ({
     winapi_0_3_4.default = (f.winapi_0_3_4.default or true);
     winapi_i686_pc_windows_gnu_0_4_0.default = true;
     winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
   }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
   winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
-  winapi_build_0_1_1_features = f: updateFeatures f (rec {
+  winapi_build_0_1_1_features = f: updateFeatures f ({
     winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
   }) [];
   winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
-  winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+  winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({
     winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
   }) [];
   winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
-  winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+  winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({
     winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
   }) [];
   winreg_0_4_0 = { features?(winreg_0_4_0_features {}) }: winreg_0_4_0_ {
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 660dce347a5..b191d1c3211 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -9,7 +9,7 @@ let
   sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr";
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "nix-serve-0.2-${substring 0 7 rev}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index b495577ef66..131a3bb5fdd 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -24,7 +24,7 @@ let
     genericName = "NixUI";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "nixui";
   inherit version src;
   installPhase = ''
diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix
index 8575f126e62..1c97757ff8a 100644
--- a/pkgs/tools/package-management/opkg-utils/default.nix
+++ b/pkgs/tools/package-management/opkg-utils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "opkg-utils-20141030";
 
   # No releases, only a git tree
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
index 1a7c24e2c38..675ec61f4db 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
   name = "python2nix-20140927";
  
   src = fetchFromGitHub {