treewide: remove redundant rec

35 files changed, 71 insertions, 71 deletions

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 01c35d99ae7e7..5ff131dad9ddb 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -8,7 +8,7 @@ let
             , extraMeta ? {}
             , version ? "2.1"
             , ... } @ args:
-           stdenv.mkDerivation (rec {
+           stdenv.mkDerivation ({
 
     name = "arm-trusted-firmware-${platform}-${version}";
     inherit version;
@@ -53,7 +53,7 @@ let
     } // extraMeta;
   } // builtins.removeAttrs args [ "extraMeta" ]);
 
-in rec {
+in {
   inherit buildArmTrustedFirmware;
 
   armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec {
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 9c5ef1d028362..b6219e1c749ef 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -13,7 +13,7 @@ let
 in
 
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "canon-cups-ufr2-2.90";
   src = src_canon;
 
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index abd50850b1827..13e3013267bfa 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool
 , withDebug ? false }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "cnijfilter2";
 
   version = "5.30";
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index 15e3a1d97a904..a09311a8292d7 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -6,7 +6,7 @@
 /* this derivation is basically just a transcription of the rpm .spec
    file included in the tarball */
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "cnijfilter";
 
   /* important note about versions: cnijfilter packages seem to use
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index ba8cffc0e6542..8866b425ca8f5 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -11,7 +11,7 @@ let arch =
     else if stdenv.hostPlatform.system == "i686-linux" then "32"
     else throw "Unsupported system ${stdenv.hostPlatform.system}";
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "cnijfilter";
 
   /* important note about versions: cnijfilter packages seem to use
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
index a2fdd1abc1921..ad8b0089a8710 100644
--- a/pkgs/misc/cups/drivers/estudio/default.nix
+++ b/pkgs/misc/cups/drivers/estudio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "cups-toshiba-estudio";
   version = "7.89";
 
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix
index 21a276f9d1426..cd4c049e67f79 100644
--- a/pkgs/misc/cups/drivers/kyocera/default.nix
+++ b/pkgs/misc/cups/drivers/kyocera/default.nix
@@ -9,7 +9,7 @@ let
   libPath = lib.makeLibraryPath [ cups ];
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "cups-kyocera";
   version = "1.1203";
 
diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix
index b70b5daa7662b..87a023af1ca76 100644
--- a/pkgs/misc/cups/drivers/zj-58/default.nix
+++ b/pkgs/misc/cups/drivers/zj-58/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, cups}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "cups-zj-58";
   version = "2018-02-22";
 
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index c65c13e886ffd..3d6fb8f081ab6 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cups }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "epson-escpr";
   version = "1.6.16";
 
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix
index fb6b4956ef172..2dd32a93219d3 100644
--- a/pkgs/misc/drivers/moltengamepad/default.nix
+++ b/pkgs/misc/drivers/moltengamepad/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, udev }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "moltengamepad-git";
   version = "2016-05-04";
 
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
index 366535b51c65a..4b19932450eca 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -4,7 +4,7 @@
 
 with python3Packages;
 
-buildPythonApplication rec {
+buildPythonApplication {
   pname = "steamcontroller";
   version = "2017-08-11";
 
diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix
index 88e8556ec6c3f..39a7e38e03466 100644
--- a/pkgs/misc/emulators/blastem/default.nix
+++ b/pkgs/misc/emulators/blastem/default.nix
@@ -2,7 +2,7 @@
 
 let
   vasm =
-    stdenv.mkDerivation rec {
+    stdenv.mkDerivation {
       pname = "vasm";
       version = "1.8c";
       src = fetchFromGitHub {
@@ -18,7 +18,7 @@ let
       '';
     };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "blastem";
   version = "0.5.1";
   src = fetchurl {
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index efa1a881f4ab8..d8717b46eef48 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
 
-stdenv.mkDerivation rec { 
+stdenv.mkDerivation { 
   pname = "citra";
   version = "2019-05-25";
 
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 7312ad41ada50..d8f5f1cbdb03f 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
 , freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "emulationstation";
   version = "2.0.1a";
 
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
index c2494d702708c..da6a7c8bf2f30 100644
--- a/pkgs/misc/emulators/kega-fusion/default.nix
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -3,7 +3,7 @@
 let
   libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ];
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "kega-fusion";
   version = "3.63x";
 
diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix
index 8a95d6f28837e..6ac6f93750e54 100644
--- a/pkgs/misc/emulators/openmsx/default.nix
+++ b/pkgs/misc/emulators/openmsx/default.nix
@@ -6,7 +6,7 @@
 , freetype, tcl, zlib
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
 
   pname = "openmsx";
   version = "git-2017-11-02";
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 3f20390fba73b..fbde2ff54c9e1 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -67,7 +67,7 @@ in with stdenv.lib.licenses;
     buildPhase = "make";
   };
 
-  beetle-pce-fast = let der = (mkLibRetroCore rec {
+  beetle-pce-fast = let der = (mkLibRetroCore {
     core = "mednafen-pce-fast";
     src = fetchRetro {
       repo = "beetle-pce-fast-libretro";
@@ -81,7 +81,7 @@ in with stdenv.lib.licenses;
     name = "beetle-pce-fast-${der.version}";
   };
 
-  beetle-psx = let der = (mkLibRetroCore rec {
+  beetle-psx = let der = (mkLibRetroCore {
     core = "mednafen-psx";
     src = fetchRetro {
       repo = "beetle-psx-libretro";
@@ -95,7 +95,7 @@ in with stdenv.lib.licenses;
     name = "beetle-psx-${der.version}";
   };
 
-  beetle-saturn = let der = (mkLibRetroCore rec {
+  beetle-saturn = let der = (mkLibRetroCore {
     core = "mednafen-saturn";
     src = fetchRetro {
       repo = "beetle-saturn-libretro";
@@ -110,7 +110,7 @@ in with stdenv.lib.licenses;
     meta.platforms = [ "x86_64-linux" ];
   };
 
-  bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec {
+  bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore {
     core = bname + "-accuracy";
     src = fetchRetro {
       repo = bname;
@@ -204,7 +204,7 @@ in with stdenv.lib.licenses;
     license = gpl2;
   };
 
-  genesis-plus-gx = mkLibRetroCore rec {
+  genesis-plus-gx = mkLibRetroCore {
     core = "genesis-plus-gx";
     src = fetchRetro {
       repo = "Genesis-Plus-GX";
@@ -215,7 +215,7 @@ in with stdenv.lib.licenses;
     license = "Non-commercial";
   };
 
-  higan-sfc = (mkLibRetroCore rec {
+  higan-sfc = (mkLibRetroCore {
     core = "higan-sfc";
     src = fetchFromGitLab {
       owner = "higan";
@@ -346,7 +346,7 @@ in with stdenv.lib.licenses;
     buildPhase = "make";
   };
 
-  quicknes = (mkLibRetroCore rec {
+  quicknes = (mkLibRetroCore {
     core = "quicknes";
     src = fetchRetro {
       repo = "QuickNES_Core";
diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
index 8bdc79f2d8ec9..d751c4f7fc43c 100644
--- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
+++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
@@ -17,7 +17,7 @@ let
 
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "kodi-retroarch-advanced-launchers";
   version = "0.2";
 
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index 25af4f8d50a70..44571de3489d8 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -2,7 +2,7 @@
 , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "retrofe";
   version = "0.6.169";
 
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index ae1b1bf6bda24..674222dc35559 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/pkgs/misc/emulators/rpcs3/default.nix
@@ -9,7 +9,7 @@ let
   majorVersion = "0.0.6";
   gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "rpcs3";
   version = "${majorVersion}-${gitVersion}";
 
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index 0f2abedd3b534..e866a1937d69d 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -64,7 +64,7 @@ assert length toolkits  == 0 -> throw "at least one GUI toolkit must be enabled"
 assert length renderers == 0 -> throw "at least one renderer must be enabled";
 
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "gnash";
   version = "0.8.11-2019-30-01";
 
diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
index f3d5450c94baa..4597fa40390de 100644
--- a/pkgs/misc/gnuk/default.nix
+++ b/pkgs/misc/gnuk/default.nix
@@ -1,6 +1,6 @@
 { callPackage, fetchgit, ... } @ args:
 
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
   version = "1.0.4";
 
   src = fetchgit {
diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix
index 06a6a7e655057..ec0dd0b1fd52d 100644
--- a/pkgs/misc/mnemonicode/default.nix
+++ b/pkgs/misc/mnemonicode/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "mnemonicode";
   version = "2015-11-30";
   src = fetchFromGitHub {
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix
index 5cfddaaea571c..f69b0794ce3a0 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/pkgs/misc/screensavers/physlock/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pam, systemd }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "11-dev";
   pname = "physlock";
   src = fetchFromGitHub {
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index f61c9f5e1b9be..1072bac7816a8 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit
 , SDL2, wxGTK }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
 
   pname = "sound-of-sorting";
   version = "unstable-2015-07-21";
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
index b5dc7a13f1838..d0d3fbdf2d73f 100644
--- a/pkgs/misc/stabber/default.nix
+++ b/pkgs/misc/stabber/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "stabber-unstable";
   version = "2016-11-09";
 
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix
index 054cd1aeffc3c..decdbdfac2dcf 100644
--- a/pkgs/misc/themes/arc-kde/default.nix
+++ b/pkgs/misc/themes/arc-kde/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "arc-kde-theme";
   version = "2017-11-09";
 
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix
index dfa788f6ea7bc..72e87e2e27401 100644
--- a/pkgs/misc/themes/numix-sx/default.nix
+++ b/pkgs/misc/themes/numix-sx/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gtk-engine-murrine }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "2017-04-24";
   pname = "numix-sx-gtk-theme";
 
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
index 2f7a53dc2d431..e7235a900cf9d 100644
--- a/pkgs/misc/themes/paper/default.nix
+++ b/pkgs/misc/themes/paper/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "2016-08-16";
   pname = "paper-gtk-theme";
 
diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix
index 3d9403b84f462..96843e8d78b46 100644
--- a/pkgs/misc/themes/solarc/default.nix
+++ b/pkgs/misc/themes/solarc/default.nix
@@ -2,7 +2,7 @@
   gtk-engine-murrine, gtk3
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "solarc-gtk-theme";
   version = "1.0.2";
 
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 6fe1a2081d226..6f1c8af390c87 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -13,7 +13,7 @@ let
             , extraMakeFlags ? []
             , extraMeta ? {}
             , ... } @ args:
-           stdenv.mkDerivation (rec {
+           stdenv.mkDerivation ({
 
     pname = "uboot-${defconfig}";
     inherit version;
@@ -86,10 +86,10 @@ let
     } // extraMeta;
   } // removeAttrs args [ "extraMeta" ]);
 
-in rec {
+in {
   inherit buildUBoot;
 
-  ubootTools = buildUBoot rec {
+  ubootTools = buildUBoot {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
     hardeningDisable = [];
@@ -108,45 +108,45 @@ in rec {
     ];
   };
 
-  ubootA20OlinuxinoLime = buildUBoot rec {
+  ubootA20OlinuxinoLime = buildUBoot {
     defconfig = "A20-OLinuXino-Lime_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootBananaPi = buildUBoot rec {
+  ubootBananaPi = buildUBoot {
     defconfig = "Bananapi_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootBananaPim64 = buildUBoot rec {
+  ubootBananaPim64 = buildUBoot {
     defconfig = "bananapi_m64_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootBeagleboneBlack = buildUBoot rec {
+  ubootBeagleboneBlack = buildUBoot {
     defconfig = "am335x_boneblack_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["MLO" "u-boot.img"];
   };
 
   # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
-  ubootClearfog = buildUBoot rec {
+  ubootClearfog = buildUBoot {
     defconfig = "clearfog_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-spl.kwb"];
   };
 
-  ubootGuruplug = buildUBoot rec {
+  ubootGuruplug = buildUBoot {
     defconfig = "guruplug_defconfig";
     extraMeta.platforms = ["armv5tel-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootJetsonTK1 = buildUBoot rec {
+  ubootJetsonTK1 = buildUBoot {
     defconfig = "jetson-tk1_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
@@ -157,114 +157,114 @@ in rec {
     '';
   };
 
-  ubootNovena = buildUBoot rec {
+  ubootNovena = buildUBoot {
     defconfig = "novena_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin" "SPL"];
   };
 
-  ubootOdroidXU3 = buildUBoot rec {
+  ubootOdroidXU3 = buildUBoot {
     defconfig = "odroid-xu3_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-dtb.bin"];
   };
 
-  ubootOrangePiPc = buildUBoot rec {
+  ubootOrangePiPc = buildUBoot {
     defconfig = "orangepi_pc_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootOrangePiZeroPlus2H5 = buildUBoot rec {
+  ubootOrangePiZeroPlus2H5 = buildUBoot {
     defconfig = "orangepi_zero_plus2_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootPcduino3Nano = buildUBoot rec {
+  ubootPcduino3Nano = buildUBoot {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootPine64 = buildUBoot rec {
+  ubootPine64 = buildUBoot {
     defconfig = "pine64_plus_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootPine64LTS = buildUBoot rec {
+  ubootPine64LTS = buildUBoot {
     defconfig = "pine64-lts_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootPinebook = buildUBoot rec {
+  ubootPinebook = buildUBoot {
     defconfig = "pinebook_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootQemuAarch64 = buildUBoot rec {
+  ubootQemuAarch64 = buildUBoot {
     defconfig = "qemu_arm64_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootQemuArm = buildUBoot rec {
+  ubootQemuArm = buildUBoot {
     defconfig = "qemu_arm_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootRaspberryPi = buildUBoot rec {
+  ubootRaspberryPi = buildUBoot {
     defconfig = "rpi_defconfig";
     extraMeta.platforms = ["armv6l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootRaspberryPi2 = buildUBoot rec {
+  ubootRaspberryPi2 = buildUBoot {
     defconfig = "rpi_2_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootRaspberryPi3_32bit = buildUBoot rec {
+  ubootRaspberryPi3_32bit = buildUBoot {
     defconfig = "rpi_3_32b_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootRaspberryPi3_64bit = buildUBoot rec {
+  ubootRaspberryPi3_64bit = buildUBoot {
     defconfig = "rpi_3_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootRaspberryPiZero = buildUBoot rec {
+  ubootRaspberryPiZero = buildUBoot {
     defconfig = "rpi_0_w_defconfig";
     extraMeta.platforms = ["armv6l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootSheevaplug = buildUBoot rec {
+  ubootSheevaplug = buildUBoot {
     defconfig = "sheevaplug_defconfig";
     extraMeta.platforms = ["armv5tel-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
-  ubootSopine = buildUBoot rec {
+  ubootSopine = buildUBoot {
     defconfig = "sopine_baseboard_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
     BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
-  ubootUtilite = buildUBoot rec {
+  ubootUtilite = buildUBoot {
     defconfig = "cm_fx6_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-with-nand-spl.imx"];
@@ -276,7 +276,7 @@ in rec {
     # sf probe; sf update $loadaddr 0 80000
   };
 
-  ubootWandboard = buildUBoot rec {
+  ubootWandboard = buildUBoot {
     defconfig = "wandboard_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.img" "SPL"];
diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
index e49b4b519f1c7..9dd43f5fe7e00 100644
--- a/pkgs/misc/uboot/rock64.nix
+++ b/pkgs/misc/uboot/rock64.nix
@@ -5,7 +5,7 @@
     rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
     sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
   };
-in buildUBoot rec {
+in buildUBoot {
   version = "2017.09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix
index 45f6d5de2a9ae..436e1bcdf878a 100644
--- a/pkgs/misc/uboot/rockpro64.nix
+++ b/pkgs/misc/uboot/rockpro64.nix
@@ -5,7 +5,7 @@
     rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
     sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
   };
-in buildUBoot rec {
+in buildUBoot {
   version = "2017.09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index fad9503559b16..c7b618323fc1e 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -316,7 +316,7 @@ let
           ++ (builtins.map (link packageName "opt") opt)
         );
         packDir = (packages:
-          stdenv.mkDerivation rec {
+          stdenv.mkDerivation {
             name = "vim-pack-dir";
             src = ./.;
             installPhase = lib.concatStringsSep
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index c474225312067..e1b928b137317 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -10,7 +10,7 @@ in
 # So an extension's attribute name should be of the form:
 # "${mktplcRef.publisher}.${mktplcRef.name}".
 #
-rec {
+{
 
   alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
     mktplcRef = {